Changeset b317b0b in mainline for uspace/drv

Timestamp:

2011-02-21T19:50:41Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

15b0432

Parents:

ace12560 (diff), 41b70d30 (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 from usb/development

Location:

uspace/drv

Files:

• uhci-rhd/root_hub.c (modified) (1 diff)
• usbhid/main.c (modified) (1 diff)
• usbhub/main.c (modified) (1 diff)
• usbhub/port_status.h (modified) (1 diff)
• usbhub/usbhub.c (modified) (3 diffs)
• usbhub/usbhub.h (modified) (1 diff)
• usbhub/usbhub_private.h (modified) (1 diff)
• usbhub/utils.c (modified) (1 diff)
• vhc/hub.c (modified) (3 diffs)
• vhc/hub/hub.c (modified) (1 diff)
• vhc/hub/virthub.c (modified) (1 diff)

uspace/drv/uhci-rhd/root_hub.c

@@ -35 +35 @@
 #include <stdint.h>
 
-#include <usb/usbdrv.h>
 #include <usb/debug.h>
 

uspace/drv/usbhid/main.c

@@ -36 +36 @@
  */
 
-#include <usb/usbdrv.h>
 #include <driver.h>
 #include <ipc/driver.h>

uspace/drv/usbhub/main.c

@@ -34 +34 @@
 #include <errno.h>
 #include <async.h>
-
-#include <usb/usbdrv.h>
-
 
 #include "usbhub.h"

uspace/drv/usbhub/port_status.h

@@ -35 +35 @@
 #include <bool.h>
 #include <sys/types.h>
-#include <usb/devreq.h>
+#include <usb/request.h>
 #include "usbhub_private.h"
 

uspace/drv/usbhub/usbhub.c

@@ -40 +40 @@
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
-#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
 #include <usb/recognise.h>
-#include <usb/devreq.h>
 #include <usb/request.h>
 #include <usb/classes/hub.h>
@@ -232 +230 @@
 
 /**
- * Convenience function for releasing default address and writing debug info
- * (these few lines are used too often to be written again and again).
- * @param hc
- * @return
- */
-inline static int usb_hub_release_default_address(int hc){
-        int opResult;
-        dprintf(USB_LOG_LEVEL_INFO, "releasing default address");
-        opResult = usb_drv_release_default_address(hc);
-        if (opResult != EOK) {
-                dprintf(USB_LOG_LEVEL_WARNING, "failed to release default address");
-        }
-        return opResult;
-}
-
-/**
  * Reset the port with new device and reserve the default address.
  * @param hc
@@ -261 +243 @@
         //opResult = usb_drv_reserve_default_address(hc);
         opResult = usb_hc_reserve_default_address(&hub->connection, USB_SPEED_LOW);
+
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_WARNING, "cannot assign default address, it is probably used");

uspace/drv/usbhub/usbhub.h

@@ -42 +42 @@
 #define NAME "usbhub"
 
-//#include "usb/hcdhubd.h"
-#include <usb/usbdrv.h>
 #include <usb/hub.h>
 

uspace/drv/usbhub/usbhub_private.h

@@ -47 +47 @@
 #include <usb/classes/hub.h>
 #include <usb/usb.h>
-#include <usb/usbdrv.h>
-
-//#include <usb/devreq.h>
 #include <usb/debug.h>
+#include <usb/request.h>
 
 //************

uspace/drv/usbhub/utils.c

@@ -38 +38 @@
 
 #include <usbhc_iface.h>
-#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
-#include <usb/devreq.h>
 #include <usb/classes/hub.h>
 

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"