Changes in uspace/drv/bus/usb/usbmast/main.c [f73b291:56fd7cf] in mainline

File:

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

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

@@ -100 +100 @@
 static usbmast_fun_t *bd_srv_usbmast(bd_srv_t *bd)
 {
-        return (usbmast_fun_t *) bd->srvs->sarg;
+        return (usbmast_fun_t *)bd->srvs->sarg;
 }
 
@@ -160 +160 @@
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
+        usb_log_info("Initializing mass storage `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
         usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
             dev->pipes[BULK_IN_EP].pipe.endpoint_no,
@@ -245 +245 @@
 
         /* Set up a connection handler. */
-        fun->conn_handler = usbmast_bd_connection;
+        ddf_fun_set_conn_handler(fun, usbmast_bd_connection);
 
         usb_log_debug("Inquire...\n");
@@ -252 +252 @@
         if (rc != EOK) {
                 usb_log_warning("Failed to inquire device `%s': %s.\n",
-                    mdev->ddf_dev->name, str_error(rc));
+                    ddf_dev_get_name(mdev->ddf_dev), str_error(rc));
                 rc = EIO;
                 goto error;
@@ -259 +259 @@
         usb_log_info("Mass storage `%s' LUN %u: " \
             "%s by %s rev. %s is %s (%s).\n",
-            mdev->ddf_dev->name,
+            ddf_dev_get_name(mdev->ddf_dev),
             lun,
             inquiry.product,
@@ -272 +272 @@
         if (rc != EOK) {
                 usb_log_warning("Failed to read capacity, device `%s': %s.\n",
-                    mdev->ddf_dev->name, str_error(rc));
+                    ddf_dev_get_name(mdev->ddf_dev), str_error(rc));
                 rc = EIO;
                 goto error;
@@ -310 +310 @@
         usbmast_fun_t *mfun;
 
-        mfun = (usbmast_fun_t *) ((ddf_fun_t *)arg)->driver_data;
+        mfun = (usbmast_fun_t *) ddf_fun_data_get((ddf_fun_t *)arg);
         bd_conn(iid, icall, &mfun->bds);
 }