Changeset 4144630 in mainline for uspace/lib/usb/src/hubdrv.c

Timestamp:

2010-12-03T15:43:43Z (14 years ago)

Author:

smekideki@…>

Branches:

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

Children:

2cb6571, 45e9cc6

Parents:

c39544a

Message:

usb adresses assigning

File:

• uspace/lib/usb/src/hubdrv.c (modified) (6 diffs)

uspace/lib/usb/src/hubdrv.c

@@ -113 +113 @@
         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);
+        printf("[hcdhubd]%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;
@@ -135 +134 @@
  */
 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);
+        //usb_hc_device_t *hc = list_get_instance(hc_list.next, usb_hc_device_t, link);
+        assert(dev->parent);
+        usb_hc_device_t *hc = (usb_hc_device_t*)dev->parent->driver_data;
+        usb_address_t addr =usb_use_free_address(hc);
+        if(addr<0){
+                printf("[hcdhubd] ERROR: cannot find an address \n");
+        }
+        set_hub_address(hc, addr);
 
         check_hub_changes();
@@ -151 +156 @@
                 my_hcd = my_hcd->parent;
         //dev->
-        printf("%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
+        printf("[hcdhubd]%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
         my_hcd = dev;
         while (my_hcd->parent)
@@ -157 +162 @@
         //dev->
 
-        printf("%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
+        printf("[hcdhubd]%s: owner hcd found: %s\n", hc_driver->name, my_hcd->name);
 
         //create the hub structure
@@ -183 +188 @@
  */
 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);
+        printf("[hcdhubd]%s: setting hub address to %d\n", hc->generic->name, address);
         usb_target_t target = {0, 0};
         usb_handle_t handle;
@@ -217 +222 @@
         }
 
-        printf("%s: hub address changed\n", hc->generic->name);
+        printf("[hcdhubd]%s: hub address changed successfully to %d\n",
+                        hc->generic->name, address);
 }