Changeset 1d5a540 in mainline for uspace/drv/bus/usb/usbmast

Timestamp:

2012-08-17T11:52:20Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

034c4202

Parents:

8312577 (diff), 56fd7cf (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 DDF interface tightening.

Location:

uspace/drv/bus/usb/usbmast

Files:

• main.c (modified) (6 diffs)
• scsi_ms.c (modified) (11 diffs)

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

@@ -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);
 }

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

@@ -88 +88 @@
                 if (rc != EOK) {
                         usb_log_error("Inquiry transport failed, device %s: %s.\n",
-                           mfun->mdev->ddf_dev->name, str_error(rc));
+                           ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc));
                         return rc;
                 }
@@ -96 +96 @@
 
                 usb_log_error("SCSI command failed, device %s.\n",
-                    mfun->mdev->ddf_dev->name);
+                    ddf_dev_get_name(mfun->mdev->ddf_dev));
 
                 rc = usbmast_request_sense(mfun, &sense_buf, sizeof(sense_buf));
@@ -147 +147 @@
         if (rc != EOK) {
                 usb_log_error("Inquiry transport failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
+                   ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc));
                 return rc;
         }
@@ -153 +153 @@
         if (cmd.status != CMDS_GOOD) {
                 usb_log_error("Inquiry command failed, device %s.\n",
-                   mfun->mdev->ddf_dev->name);
+                   ddf_dev_get_name(mfun->mdev->ddf_dev));
                 return EIO;
         }
@@ -215 +215 @@
         if (rc != EOK || cmd.status != CMDS_GOOD) {
                 usb_log_error("Request Sense failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
+                   ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc));
                 return rc;
         }
@@ -257 +257 @@
         if (rc != EOK) {
                 usb_log_error("Read Capacity (10) transport failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
+                   ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc));
                 return rc;
         }
@@ -263 +263 @@
         if (cmd.status != CMDS_GOOD) {
                 usb_log_error("Read Capacity (10) command failed, device %s.\n",
-                   mfun->mdev->ddf_dev->name);
+                   ddf_dev_get_name(mfun->mdev->ddf_dev));
                 return EIO;
         }
@@ -314 +314 @@
         if (rc != EOK) {
                 usb_log_error("Read (10) transport failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
+                   ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc));
                 return rc;
         }
@@ -320 +320 @@
         if (cmd.status != CMDS_GOOD) {
                 usb_log_error("Read (10) command failed, device %s.\n",
-                   mfun->mdev->ddf_dev->name);
+                   ddf_dev_get_name(mfun->mdev->ddf_dev));
                 return EIO;
         }
@@ -370 +370 @@
         if (rc != EOK) {
                 usb_log_error("Write (10) transport failed, device %s: %s.\n",
-                   mfun->mdev->ddf_dev->name, str_error(rc));
+                   ddf_dev_get_name(mfun->mdev->ddf_dev), str_error(rc));
                 return rc;
         }
@@ -376 +376 @@
         if (cmd.status != CMDS_GOOD) {
                 usb_log_error("Write (10) command failed, device %s.\n",
-                   mfun->mdev->ddf_dev->name);
+                   ddf_dev_get_name(mfun->mdev->ddf_dev));
                 return EIO;
         }