Changeset deece2f in mainline for uspace/drv/vhc

Timestamp:

2011-02-21T22:25:58Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

233e68d

Parents:

fb78ae72 (diff), dbe25f1 (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:

Development branch merge

Location:

uspace/drv/vhc

Files:

• conn.h (modified) (2 diffs)
• connhost.c (modified) (5 diffs)
• hcd.c (modified) (2 diffs)
• hub.c (modified) (3 diffs)
• hub/hub.c (modified) (1 diff)
• hub/virthub.c (modified) (1 diff)

uspace/drv/vhc/conn.h

@@ -38 +38 @@
 #include <usb/usb.h>
 #include <usbhc_iface.h>
+#include <usb_iface.h>
 #include "vhcd.h"
 #include "devices.h"
@@ -43 +44 @@
 void connection_handler_host(sysarg_t);
 
-usbhc_iface_t vhc_iface;
+extern usbhc_iface_t vhc_iface;
+extern usb_iface_t vhc_usb_iface;
 
 void address_init(void);

uspace/drv/vhc/connhost.c

@@ -37 +37 @@
 #include <usb/usb.h>
 #include <usb/addrkeep.h>
+#include <usb/ddfiface.h>
 
 #include "vhcd.h"
@@ -313 +314 @@
 static usb_address_keeping_t addresses;
 
+static int tell_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
+{
+        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        *address = addr;
+        return EOK;
+}
 
 static int reserve_default_address(device_t *dev, usb_speed_t ignored)
@@ -350 +362 @@
 }
 
-static int tell_address(device_t *dev, devman_handle_t handle,
-    usb_address_t *address)
-{
-        usb_address_t addr = usb_address_keeping_find(&addresses, handle);
-        if (addr < 0) {
-                return addr;
-        }
-
-        *address = addr;
-        return EOK;
-}
-
 void address_init(void)
 {
@@ -368 +368 @@
 
 usbhc_iface_t vhc_iface = {
-        .tell_address = tell_address,
-
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,
@@ -383 +381 @@
 };
 
+usb_iface_t vhc_usb_iface = {
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
+        .get_address = tell_address
+};
+
+
 /**
  * @}

uspace/drv/vhc/hcd.c

@@ -45 +45 @@
 
 #include <usb/usb.h>
+#include <usb/ddfiface.h>
 #include <usb_iface.h>
 #include "vhcd.h"
@@ -52 +53 @@
 #include "conn.h"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
-{
-        /* This shall be called only for VHC device. */
-        assert(dev->parent == NULL);
-
-        *handle = dev->handle;
-        return EOK;
-}
-
-static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
-};
-
 static device_ops_t vhc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &vhc_iface,
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
+        .interfaces[USB_DEV_IFACE] = &vhc_usb_iface,
         .close = on_client_close,
         .default_handler = default_connection_handler

uspace/drv/vhc/hub.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <driver.h>
-#include <usb/usbdrv.h>
+#include <usb/hub.h>
 #include <usb/recognise.h>
 
@@ -71 +71 @@
 }
 
+static int pretend_port_rest(int unused, void *unused2)
+{
+        return EOK;
+}
+
 /** Register root hub in devman.
  *
@@ -80 +85 @@
         device_t *hc_dev = (device_t *) arg;
 
-        int hc;
+        /*
+         * Wait until parent device is properly initialized.
+         */
+        int phone;
         do {
-                hc = usb_drv_hc_connect(hc_dev, hc_dev->handle,
-                    IPC_FLAG_BLOCKING);
-        } while (hc < 0);
+                phone = devman_device_connect(hc_dev->handle, 0);
+        } while (phone < 0);
+        async_hangup(phone);
 
-        usb_drv_reserve_default_address(hc);
+        usb_hc_connection_t hc_conn;
+        usb_hc_connection_initialize(&hc_conn, hc_dev->handle);
 
-        usb_address_t hub_address = usb_drv_request_address(hc);
-        usb_drv_req_set_address(hc, USB_ADDRESS_DEFAULT, hub_address);
+        usb_hc_connection_open(&hc_conn);
 
-        usb_drv_release_default_address(hc);
+        int rc = usb_hc_new_device_wrapper(hc_dev, &hc_conn, USB_SPEED_FULL,
+            pretend_port_rest, 0, NULL,
+            NULL, NULL);
+        if (rc != EOK) {
+                usb_log_fatal("Failed to create root hub: %s.\n",
+                    str_error(rc));
+        }
 
-        devman_handle_t 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);
+        usb_hc_connection_close(&hc_conn);
 
-        return EOK;
+        return 0;
 }
         

uspace/drv/vhc/hub/hub.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <driver.h>
-#include <usb/usbdrv.h>
 
 #include "hub.h"

uspace/drv/vhc/hub/virthub.c

@@ -41 +41 @@
 #include <stdlib.h>
 #include <driver.h>
-#include <usb/usbdrv.h>
 
 #include "virthub.h"