Changeset 00aece0 in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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 mainline changes.

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (13 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -55 +55 @@
 #define GET_BULK_OUT(dev) ((dev)->pipes[BULK_OUT_EP].pipe)
 
-static usb_endpoint_description_t bulk_in_ep = {
+static const usb_endpoint_description_t bulk_in_ep = {
         .transfer_type = USB_TRANSFER_BULK,
         .direction = USB_DIRECTION_IN,
@@ -63 +63 @@
         .flags = 0
 };
-static usb_endpoint_description_t bulk_out_ep = {
+static const usb_endpoint_description_t bulk_out_ep = {
         .transfer_type = USB_TRANSFER_BULK,
         .direction = USB_DIRECTION_OUT,
@@ -72 +72 @@
 };
 
-usb_endpoint_description_t *mast_endpoints[] = {
+static const usb_endpoint_description_t *mast_endpoints[] = {
         &bulk_in_ep,
         &bulk_out_ep,
@@ -82 +82 @@
     void *arg);
 
+/** Callback when a device is removed from the system.
+ *
+ * @param dev Representation of USB device.
+ * @return Error code.
+ */
+static int usbmast_device_gone(usb_device_t *dev)
+{
+        usbmast_dev_t *mdev = dev->driver_data;
+        assert(mdev);
+
+        for (size_t i = 0; i < mdev->lun_count; ++i) {
+                const int rc = ddf_fun_unbind(mdev->luns[i]);
+                if (rc != EOK) {
+                        usb_log_error("Failed to unbind LUN function %zu: "
+                            "%s\n", i, str_error(rc));
+                        return rc;
+                }
+                ddf_fun_destroy(mdev->luns[i]);
+                mdev->luns[i] = NULL;
+        }
+        free(mdev->luns);
+        return EOK;
+}
+
+/** Callback when a device is about to be removed.
+ *
+ * @param dev Representation of USB device.
+ * @return Error code.
+ */
+static int usbmast_device_remove(usb_device_t *dev)
+{
+        //TODO: flush buffers, or whatever.
+        //TODO: remove device
+        return ENOTSUP;
+}
+
 /** Callback when new device is attached and recognized as a mass storage.
  *
- * @param dev Representation of a the USB device.
+ * @param dev Representation of USB device.
  * @return Error code.
  */
-static int usbmast_add_device(usb_device_t *dev)
+static int usbmast_device_add(usb_device_t *dev)
 {
         int rc;
@@ -94 +130 @@
 
         /* Allocate softstate */
-        mdev = calloc(1, sizeof(usbmast_dev_t));
+        mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
+                return ENOMEM;
         }
 
@@ -104 +139 @@
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n",
-            dev->ddf_dev->name);
-        usb_log_debug(" Bulk in endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_IN_EP].pipe->endpoint_no,
-            (size_t) dev->pipes[BULK_IN_EP].descriptor->max_packet_size);
+        usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
+        usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
+            dev->pipes[BULK_IN_EP].pipe.endpoint_no,
+            dev->pipes[BULK_IN_EP].pipe.max_packet_size);
         usb_log_debug("Bulk out endpoint: %d [%zuB].\n",
-            dev->pipes[BULK_OUT_EP].pipe->endpoint_no,
-            (size_t) dev->pipes[BULK_OUT_EP].descriptor->max_packet_size);
+            dev->pipes[BULK_OUT_EP].pipe.endpoint_no,
+            dev->pipes[BULK_OUT_EP].pipe.max_packet_size);
 
         usb_log_debug("Get LUN count...\n");
-        mdev->luns = usb_masstor_get_lun_count(mdev);
-
-        for (i = 0; i < mdev->luns; i++) {
+        mdev->lun_count = usb_masstor_get_lun_count(mdev);
+        mdev->luns = calloc(mdev->lun_count, sizeof(ddf_fun_t*));
+        if (mdev->luns == NULL) {
+                rc = ENOMEM;
+                usb_log_error("Failed allocating luns table.\n");
+                goto error;
+        }
+
+        for (i = 0; i < mdev->lun_count; i++) {
                 rc = usbmast_fun_create(mdev, i);
                 if (rc != EOK)
@@ -124 +164 @@
         return EOK;
 error:
-        /* XXX Destroy functions */
-        if (mdev != NULL)
-                free(mdev);
+        /* Destroy functions */
+        for (size_t i = 0; i < mdev->lun_count; ++i) {
+                if (mdev->luns[i] == NULL)
+                        continue;
+                const int rc = ddf_fun_unbind(mdev->luns[i]);
+                if (rc != EOK) {
+                        usb_log_warning("Failed to unbind LUN function %zu: "
+                            "%s.\n", i, str_error(rc));
+                }
+                ddf_fun_destroy(mdev->luns[i]);
+        }
+        free(mdev->luns);
         return rc;
 }
@@ -145 +194 @@
         usbmast_fun_t *mfun = NULL;
 
-        /* Allocate softstate */
-        mfun = calloc(1, sizeof(usbmast_fun_t));
-        if (mfun == NULL) {
-                usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
-        }
-
-        mfun->mdev = mdev;
-        mfun->lun = lun;
-
         if (asprintf(&fun_name, "l%u", lun) < 0) {
                 usb_log_error("Out of memory.\n");
@@ -169 +207 @@
         }
 
-        free(fun_name);
-        fun_name = NULL;
+        /* Allocate soft state */
+        mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
+        if (mfun == NULL) {
+                usb_log_error("Failed allocating softstate.\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        mfun->ddf_fun = fun;
+        mfun->mdev = mdev;
+        mfun->lun = lun;
 
         /* Set up a connection handler. */
         fun->conn_handler = usbmast_bd_connection;
-        fun->driver_data = mfun;
 
         usb_log_debug("Inquire...\n");
@@ -219 +265 @@
         }
 
+        free(fun_name);
+        mdev->luns[lun] = fun;
+
         return EOK;
 
@@ -227 +276 @@
         if (fun_name != NULL)
                 free(fun_name);
-        if (mfun != NULL)
-                free(mfun);
         return rc;
 }
@@ -253 +300 @@
                 return;
         }
-
-        comm_buf = as_get_mappable_page(comm_size);
-        if (comm_buf == NULL) {
+        
+        (void) async_share_out_finalize(callid, &comm_buf);
+        if (comm_buf == (void *) -1) {
                 async_answer_0(callid, EHANGUP);
                 return;
         }
-
-        (void) async_share_out_finalize(callid, comm_buf);
-
+        
         mfun = (usbmast_fun_t *) ((ddf_fun_t *)arg)->driver_data;
 
@@ -301 +346 @@
 
 /** USB mass storage driver ops. */
-static usb_driver_ops_t usbmast_driver_ops = {
-        .add_device = usbmast_add_device,
+static const usb_driver_ops_t usbmast_driver_ops = {
+        .device_add = usbmast_device_add,
+        .device_rem = usbmast_device_remove,
+        .device_gone = usbmast_device_gone,
 };
 
 /** USB mass storage driver. */
-static usb_driver_t usbmast_driver = {
+static const usb_driver_t usbmast_driver = {
         .name = NAME,
         .ops = &usbmast_driver_ops,