Changeset b995183 in mainline

Timestamp:

2013-01-06T16:19:33Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e938fa6

Parents:

be554d9

Message:

libusbhost: Add support for device removal. Use address as id.

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (1 diff)
• src/ddf_helpers.c (modified) (19 diffs)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -46 +46 @@
     usb_speed_t max_speed, size_t bw, bw_count_func_t bw_count);
 int hcd_ddf_setup_root_hub(ddf_dev_t *dev, usb_speed_t speed);
-int hcd_ddf_new_device(ddf_dev_t *device);
+int hcd_ddf_new_device(ddf_dev_t *device, usb_address_t *address);
+int hcd_ddf_remove_device(ddf_dev_t *device, usb_address_t address);
 
 hcd_t *dev_to_hcd(ddf_dev_t *dev);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -51 +51 @@
         ddf_fun_t *hc_fun;
         list_t devices;
+        fibril_mutex_t guard;
 } hc_dev_t;
 
@@ -73 +74 @@
         usb_address_t address;
         usb_speed_t speed;
-        devman_handle_t handle;
+        devman_handle_t hc_handle;
 } usb_dev_t;
 
@@ -82 +83 @@
  * @return Error code.
  */
-static int rh_get_my_address(ddf_fun_t *fun, usb_address_t *address)
+static int get_my_address(ddf_fun_t *fun, usb_address_t *address)
 {
         assert(fun);
@@ -98 +99 @@
  * @return Error code.
  */
-static int rh_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
+static int get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
         assert(fun);
@@ -104 +105 @@
         if (handle != NULL) {
                 usb_dev_t *usb_dev = ddf_fun_data_get(fun);
-                *handle = usb_dev->handle;
+                *handle = usb_dev->hc_handle;
         }
         return EOK;
@@ -111 +112 @@
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
-        .get_hc_handle = rh_get_hc_handle,
-        .get_my_address = rh_get_my_address,
+        .get_hc_handle = get_hc_handle,
+        .get_my_address = get_my_address,
 };
 /** Standard USB RH options (RH interface) */
@@ -146 +147 @@
 };
 
-static const usb_device_request_setup_packet_t set_address = {
-        .request_type = SETUP_REQUEST_TYPE_DEVICE_TO_HOST
-            | (USB_REQUEST_TYPE_STANDARD << 5)
-            | USB_REQUEST_RECIPIENT_DEVICE,
-        .request = USB_DEVREQ_GET_DESCRIPTOR,
-        .value = uint16_host2usb(USB_DESCTYPE_DEVICE << 8),
-        .index = uint16_host2usb(0),
-        .length = uint16_host2usb(CTRL_PIPE_MIN_PACKET_SIZE),
-};
-
 int hcd_ddf_add_usb_device(ddf_dev_t *parent,
     usb_address_t address, usb_speed_t speed, const char *name,
@@ -182 +173 @@
         info->address = address;
         info->speed = speed;
-        info->handle = hc_handle;
+        info->hc_handle = hc_handle;
         info->fun = fun;
         link_initialize(&info->link);
@@ -207 +198 @@
         return EOK;
 }
-
 
 #define ADD_MATCHID_OR_RETURN(list, sc, str, ...) \
@@ -227 +217 @@
         add_match_id(list, mid); \
 } while (0)
-                
+
 
 /* This is a copy of lib/usbdev/src/recognise.c */
@@ -259 +249 @@
 }
 
-int hcd_ddf_new_device(ddf_dev_t *device)
+int hcd_ddf_remove_device(ddf_dev_t *device, usb_address_t id)
 {
         assert(device);
@@ -265 +255 @@
         hcd_t *hcd = dev_to_hcd(device);
         assert(hcd);
-        
+
+        hc_dev_t *hc_dev = dev_to_hc_dev(device);
+        assert(hc_dev);
+
+        fibril_mutex_lock(&hc_dev->guard);
+
+        usb_dev_t *victim = NULL;
+
+        list_foreach(hc_dev->devices, it) {
+                victim = list_get_instance(it, usb_dev_t, link);
+                if (victim->address == id)
+                        break;
+        }
+        if (victim && victim->address == id) {
+                list_remove(&victim->link);
+                fibril_mutex_unlock(&hc_dev->guard);
+                ddf_fun_unbind(victim->fun);
+                ddf_fun_destroy(victim->fun);
+                return EOK;
+        }
+        return ENOENT;
+}
+
+int hcd_ddf_new_device(ddf_dev_t *device, usb_address_t *id)
+{
+        assert(device);
+
+        hcd_t *hcd = dev_to_hcd(device);
+        assert(hcd);
+
         usb_speed_t speed = USB_SPEED_MAX;
 
@@ -329 +348 @@
             SET_ADDRESS(target.address);
 
-        // TODO CALLBACKS
         got = hcd_send_batch_sync(hcd, default_target, USB_DIRECTION_OUT,
             NULL, 0, *(uint64_t *)&set_address, "set address");
@@ -345 +363 @@
             GET_DEVICE_DESC(sizeof(desc));
 
-        // TODO CALLBACKS
         got = hcd_send_batch_sync(hcd, target, USB_DIRECTION_IN,
             &desc, sizeof(desc), *(uint64_t *)&get_device_desc,
@@ -354 +371 @@
                 return got < 0 ? got : EOVERFLOW;
         }
-        
+
         /* Create match ids from the device descriptor */
         match_id_list_t mids;
@@ -365 +382 @@
                 return ret;
         }
-        
-                
-
-        /* Register device */   
+
+        /* Register device */
         ret = hcd_ddf_add_usb_device(device, address, speed, NULL, &mids);
         clean_match_ids(&mids);
@@ -376 +391 @@
                 return ret;
         }
+        if (ret == EOK && id)
+                *id = target.address;
 
         return ret;
@@ -393 +410 @@
 
         hcd_reserve_default_address(hcd, speed);
-        const int ret = hcd_ddf_new_device(device);
+        const int ret = hcd_ddf_new_device(device, NULL);
         hcd_release_default_address(hcd);
         return ret;
@@ -416 +433 @@
         }
         list_initialize(&instance->devices);
+        fibril_mutex_initialize(&instance->guard);
 
 #define CHECK_RET_DEST_FREE_RETURN(ret, message...) \