Changeset 8e423a2d in mainline

Timestamp:

2010-11-26T21:51:36Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ef75332

Parents:

da55d5b (diff), 08f747e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with vojtechhorky/

Location:

uspace/lib

Files:

• drv/generic/remote_usbhc.c (modified) (3 diffs)
• drv/include/usbhc_iface.h (modified) (2 diffs)
• usb/include/usb/hcdhubd.h (modified) (1 diff)
• usb/src/hcdhubd.c (modified) (2 diffs)
• usb/src/usbdrv.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -42 +42 @@
 #define USB_MAX_PAYLOAD_SIZE 1020
 
+static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_get_buffer(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -49 +50 @@
 /** Remote USB interface operations. */
 static remote_iface_func_ptr_t remote_usbhc_iface_ops [] = {
-        &remote_usbhc_get_buffer,
-        &remote_usbhc_interrupt_out,
-        &remote_usbhc_interrupt_in
+        remote_usbhc_get_address,
+        remote_usbhc_get_buffer,
+        remote_usbhc_interrupt_out,
+        remote_usbhc_interrupt_in
 };
 
@@ -68 +70 @@
 } async_transaction_t;
 
+void remote_usbhc_get_address(device_t *device, void *iface,
+    ipc_callid_t callid, ipc_call_t *call)
+{
+        usbhc_iface_t *usb_iface = (usbhc_iface_t *) iface;
+
+        if (!usb_iface->tell_address) {
+                ipc_answer_0(callid, ENOTSUP);
+                return;
+        }
+
+        devman_handle_t handle = IPC_GET_ARG1(*call);
+
+        usb_address_t address;
+        int rc = usb_iface->tell_address(device, handle, &address);
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+        } else {
+                ipc_answer_1(callid, EOK, address);
+        }
+}
 
 void remote_usbhc_get_buffer(device_t *device, void *iface,

uspace/lib/drv/include/usbhc_iface.h

@@ -92 +92 @@
  */
 typedef enum {
+        /** Tell USB address assigned to device.
+         * Parameters:
+         * - devman handle id
+         * Answer:
+         * - EINVAL - unknown handle or handle not managed by this driver
+         * - ENOTSUP - operation not supported by HC (shall not happen)
+         * - arbitrary error code if returned by remote implementation
+         * - EOK - handle found, first parameter contains the USB address
+         */
+        IPC_M_USBHC_GET_ADDRESS,
+
         /** Asks for data buffer.
          * See explanation at usb_iface_funcs_t.
@@ -157 +168 @@
 /** USB devices communication interface. */
 typedef struct {
+        int (*tell_address)(device_t *, devman_handle_t, usb_address_t *);
         int (*interrupt_out)(device_t *, usb_target_t,
             void *, size_t,

uspace/lib/usb/include/usb/hcdhubd.h

@@ -175 +175 @@
 int usb_hc_async_wait_for(usb_handle_t);
 
+int usb_hc_add_child_device(device_t *, const char *, const char *);
 
 #endif

uspace/lib/usb/src/hcdhubd.c

@@ -414 +414 @@
  * @return Error code.
  */
-int usb_hcd_add_root_hub(usb_hc_device_t *dev) {
+int usb_hcd_add_root_hub(usb_hc_device_t *dev)
+{
+        char *id;
+        int rc = asprintf(&id, "usb&hc=%s&hub", dev->generic->name);
+        if (rc <= 0) {
+                return rc;
+        }
+
+        rc = usb_hc_add_child_device(dev->generic, USB_HUB_DEVICE_NAME, id);
+        if (rc != EOK) {
+                free(id);
+        }
+
+        return rc;
+}
+
+/** Info about child device. */
+struct child_device_info {
+        device_t *parent;
+        const char *name;
+        const char *match_id;
+};
+
+/** Adds a child device fibril worker. */
+static int fibril_add_child_device(void *arg)
+{
+        struct child_device_info *child_info
+            = (struct child_device_info *) arg;
         int rc;
 
-        /*
-         * Announce presence of child device.
-         */
-        device_t *hub = NULL;
+        device_t *child = create_device();
         match_id_t *match_id = NULL;
 
-        hub = create_device();
-        if (hub == NULL) {
+        if (child == NULL) {
                 rc = ENOMEM;
                 goto failure;
         }
-        hub->name = USB_HUB_DEVICE_NAME;
+        child->name = child_info->name;
 
         match_id = create_match_id();
@@ -435 +458 @@
                 goto failure;
         }
-
-        char *id;
-        rc = asprintf(&id, "usb&hc=%s&hub", dev->generic->name);
-        if (rc <= 0) {
-                rc = ENOMEM;
-                goto failure;
-        }
-
-        match_id->id = id;
-        match_id->score = 30;
-
-        add_match_id(&hub->match_ids, match_id);
-
-        rc = child_device_register(hub, dev->generic);
+        match_id->id = child_info->match_id;
+        match_id->score = 10;
+        printf("adding child device with match \"%s\"\n", match_id->id);
+        add_match_id(&child->match_ids, match_id);
+
+        rc = child_device_register(child, child_info->parent);
         if (rc != EOK) {
                 goto failure;
         }
 
-        printf("%s: registered root hub\n", dev->generic->name);
+        goto leave;
+
+failure:
+        if (child != NULL) {
+                child->name = NULL;
+                delete_device(child);
+        }
+
+        if (match_id != NULL) {
+                match_id->id = NULL;
+                delete_match_id(match_id);
+        }
+
+leave:
+        free(arg);
+        return rc;
+}
+
+/** Adds a child.
+ * Due to deadlock in devman when parent registers child that oughts to be
+ * driven by the same task, the child adding is done in separate fibril.
+ * Not optimal, but it works.
+ *
+ * @param parent Parent device.
+ * @param name Device name.
+ * @param match_id Match id.
+ * @return Error code.
+ */
+int usb_hc_add_child_device(device_t *parent, const char *name,
+    const char *match_id)
+{
+        struct child_device_info *child_info
+            = malloc(sizeof(struct child_device_info));
+
+        child_info->parent = parent;
+        child_info->name = name;
+        child_info->match_id = match_id;
+
+        fid_t fibril = fibril_create(fibril_add_child_device, child_info);
+        if (!fibril) {
+                return ENOMEM;
+        }
+        fibril_add_ready(fibril);
+
         return EOK;
-
-failure:
-        if (hub != NULL) {
-                hub->name = NULL;
-                delete_device(hub);
-        }
-        delete_match_id(match_id);
-
-        return rc;
 }
 

uspace/lib/usb/src/usbdrv.c

@@ -64 +64 @@
          * Call parent hub to obtain device handle of respective HC.
          */
-        return ENOTSUP;
+
+        /*
+         * FIXME: currently we connect always to virtual host controller.
+         */
+        int rc;
+        devman_handle_t handle;
+
+        rc = devman_device_get_handle("/vhc", &handle, 0);
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        int phone = devman_device_connect(handle, 0);
+
+        return phone;
 }
 
@@ -75 +89 @@
 usb_address_t usb_drv_get_my_address(int phone, device_t *dev)
 {
-        return ENOTSUP;
+        ipcarg_t address;
+        int rc = async_req_1_1(phone, IPC_M_USBHC_GET_ADDRESS,
+            dev->handle, &address);
+
+        if (rc != EOK) {
+                return rc;
+        }
+
+        return (usb_address_t) address;
 }