Changeset 4317827 in mainline for uspace/drv/usbhub/utils.c

Timestamp:

2010-12-04T14:00:41Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

36c410e

Parents:

62c9661

Message:

USB hub driver in separate task

The commit only includes changes necessary to get working (i.e. appearing
under /dev/devices) hub and VHC.

Clean-up will come later.

File:

• uspace/drv/usbhub/utils.c (moved) (moved from uspace/lib/usb/src/hubdrv.c ) (9 diffs)

uspace/drv/usbhub/utils.c

@@ -33 +33 @@
  * @brief Hub driver.
  */
-#include <usb/hcdhubd.h>
+#include <driver.h>
 #include <usb/devreq.h>
 #include <usbhc_iface.h>
+#include <usb/usbdrv.h>
 #include <usb/descriptor.h>
 #include <driver.h>
@@ -41 +42 @@
 #include <errno.h>
 #include <usb/classes/hub.h>
-#include "hcdhubd_private.h"
+#include "usbhub.h"
 
 static void check_hub_changes(void);
@@ -108 +109 @@
 //*********************************************
 
-static void set_hub_address(usb_hc_device_t *hc, usb_address_t address);
+static void set_hub_address(device_t *dev, usb_address_t address);
 
 usb_hcd_hub_info_t * usb_create_hub_info(device_t * device) {
         usb_hcd_hub_info_t* result = (usb_hcd_hub_info_t*) malloc(sizeof (usb_hcd_hub_info_t));
-        //get parent device
-        /// @TODO this code is not correct
-        device_t * my_hcd = device;
-        while (my_hcd->parent)
-                my_hcd = my_hcd->parent;
-        //dev->
-        printf("%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
-        //we add the hub into the first hc
-        //link_t *link_hc = hc_list.next;
-        //usb_hc_device_t *hc = list_get_instance(link_hc,
-        //              usb_hc_device_t, link);
-        //must get generic device info
-
 
         return result;
@@ -135 +123 @@
  */
 int usb_add_hub_device(device_t *dev) {
-        usb_hc_device_t *hc = list_get_instance(hc_list.next, usb_hc_device_t, link);
-        set_hub_address(hc, 5);
+        printf(NAME ": add_hub_device(handle=%d)\n", (int) dev->handle);
+        set_hub_address(dev, 5);
 
         check_hub_changes();
@@ -145 +133 @@
          * connected devices.
          */
-        //insert hub into list
-        //find owner hcd
-        device_t * my_hcd = dev;
-        while (my_hcd->parent)
-                my_hcd = my_hcd->parent;
-        //dev->
-        printf("%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
-        my_hcd = dev;
-        while (my_hcd->parent)
-                my_hcd = my_hcd->parent;
-        //dev->
-
-        printf("%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
 
         //create the hub structure
         usb_hcd_hub_info_t * hub_info = usb_create_hub_info(dev);
-
-
-        //append into the list
-        //we add the hub into the first hc
-        list_append(&hub_info->link, &hc->hubs);
-
-
+        (void)hub_info;
 
         return EOK;
@@ -182 +151 @@
  * @param address New hub address.
  */
-static void set_hub_address(usb_hc_device_t *hc, usb_address_t address) {
-        printf("%s: setting hub address to %d\n", hc->generic->name, address);
+static void set_hub_address(device_t *dev, usb_address_t address) {
+        printf(NAME ": setting hub address to %d\n", address);
         usb_target_t target = {0, 0};
         usb_handle_t handle;
@@ -196 +165 @@
         setup_packet.value = address;
 
-        rc = usb_hc_async_control_write_setup(hc, target,
+        int hc = usb_drv_hc_connect(dev, 0);
+
+        rc = usb_drv_async_control_write_setup(hc, target,
                         &setup_packet, sizeof (setup_packet), &handle);
         if (rc != EOK) {
@@ -202 +173 @@
         }
 
-        rc = usb_hc_async_wait_for(handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        rc = usb_hc_async_control_write_status(hc, target, &handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        rc = usb_hc_async_wait_for(handle);
-        if (rc != EOK) {
-                return;
-        }
-
-        printf("%s: hub address changed\n", hc->generic->name);
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        rc = usb_drv_async_control_write_status(hc, target, &handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        rc = usb_drv_async_wait_for(handle);
+        if (rc != EOK) {
+                return;
+        }
+
+        printf(NAME ": hub address changed\n");
 }
 
@@ -224 +195 @@
 static void check_hub_changes(void) {
         /*
-         * Iterate through all HCs.
+         * Iterate through all hubs.
          */
-        link_t *link_hc;
-        for (link_hc = hc_list.next;
-                        link_hc != &hc_list;
-                        link_hc = link_hc->next) {
-                usb_hc_device_t *hc = list_get_instance(link_hc,
-                                usb_hc_device_t, link);
-                /*
-                 * Iterate through all their hubs.
-                 */
-                link_t *link_hub;
-                for (link_hub = hc->hubs.next;
-                                link_hub != &hc->hubs;
-                                link_hub = link_hub->next) {
-                        usb_hcd_hub_info_t *hub = list_get_instance(link_hub,
-                                        usb_hcd_hub_info_t, link);
-
-                        /*
-                         * Check status change pipe of this hub.
-                         */
-                        usb_target_t target = {
-                                .address = hub->device->address,
-                                .endpoint = 1
-                        };
-
-                        // FIXME: count properly
-                        size_t byte_length = (hub->port_count / 8) + 1;
-
-                        void *change_bitmap = malloc(byte_length);
-                        size_t actual_size;
-                        usb_handle_t handle;
-
-                        /*
-                         * Send the request.
-                         * FIXME: check returned value for possible errors
-                         */
-                        usb_hc_async_interrupt_in(hc, target,
-                                        change_bitmap, byte_length, &actual_size,
-                                        &handle);
-
-                        usb_hc_async_wait_for(handle);
-
-                        /*
-                         * TODO: handle the changes.
-                         */
+        for (; false; ) {
+                /*
+                 * Check status change pipe of this hub.
+                 */
+                usb_target_t target = {
+                        .address = 5,
+                        .endpoint = 1
+                };
+
+                size_t port_count = 7;
+
+                /*
+                 * Connect to respective HC.
+                 */
+                int hc = usb_drv_hc_connect(NULL, 0);
+                if (hc < 0) {
+                        continue;
                 }
+
+                // FIXME: count properly
+                size_t byte_length = (port_count / 8) + 1;
+
+                void *change_bitmap = malloc(byte_length);
+                size_t actual_size;
+                usb_handle_t handle;
+
+                /*
+                 * Send the request.
+                 * FIXME: check returned value for possible errors
+                 */
+                usb_drv_async_interrupt_in(hc, target,
+                                change_bitmap, byte_length, &actual_size,
+                                &handle);
+
+                usb_drv_async_wait_for(handle);
+
+                /*
+                 * TODO: handle the changes.
+                 */
+
+
+                /*
+                 * Hang-up the HC-connected phone.
+                 */
+                ipc_hangup(hc);
         }
 }