Changes in uspace/drv/bus/usb/usbmast/main.c [721d4b6e:d6c953e9] in mainline

File:

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

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

@@ -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 new device is attached and recognized as a mass storage.
  *
@@ -111 +87 @@
  * @return Error code.
  */
-static int usbmast_device_add(usb_device_t *dev)
+static int usbmast_add_device(usb_device_t *dev)
 {
         int rc;
@@ -118 +94 @@
 
         /* Allocate softstate */
-        mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t));
+        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -127 +103 @@
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
+        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,
@@ -136 +113 @@
 
         usb_log_debug("Get LUN count...\n");
-        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++) {
+        mdev->luns = usb_masstor_get_lun_count(mdev);
+
+        for (i = 0; i < mdev->luns; i++) {
                 rc = usbmast_fun_create(mdev, i);
                 if (rc != EOK)
@@ -152 +123 @@
         return EOK;
 error:
-        /* 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);
+        /* XXX Destroy functions */
         return rc;
 }
@@ -203 +163 @@
         }
 
-        mfun->ddf_fun = fun;
         mfun->mdev = mdev;
         mfun->lun = lun;
@@ -254 +213 @@
 
         free(fun_name);
-        mdev->luns[lun] = fun;
 
         return EOK;
@@ -337 +295 @@
 /** USB mass storage driver ops. */
 static usb_driver_ops_t usbmast_driver_ops = {
-        .device_add = usbmast_device_add,
-        .device_gone = usbmast_device_gone,
+        .add_device = usbmast_add_device,
 };