Changeset 7c69861 in mainline

Timestamp:

2013-01-26T16:13:14Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6785b538

Parents:

bb512b2d

Message:

usbmast: Don't access ddf_dev member directly, use provided wrappers.

Location:

uspace/drv/bus/usb/usbmast

Files:

• main.c (modified) (5 diffs)
• scsi_ms.c (modified) (11 diffs)
• usbmast.h (modified) (1 diff)

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

@@ -157 +157 @@
         }
 
-        mdev->ddf_dev = dev->ddf_dev;
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n", ddf_dev_get_name(dev->ddf_dev));
+        usb_log_info("Initializing mass storage `%s'.\n",
+            usb_device_get_name(dev));
         usb_log_debug("Bulk in endpoint: %d [%zuB].\n",
             dev->pipes[BULK_IN_EP].pipe.endpoint_no,
@@ -221 +221 @@
         }
 
-        fun = ddf_fun_create(mdev->ddf_dev, fun_exposed, fun_name);
+        fun = usb_device_ddf_fun_create(mdev->usb_dev, fun_exposed, fun_name);
         if (fun == NULL) {
                 usb_log_error("Failed to create DDF function %s.\n", fun_name);
@@ -252 +252 @@
         if (rc != EOK) {
                 usb_log_warning("Failed to inquire device `%s': %s.\n",
-                    ddf_dev_get_name(mdev->ddf_dev), str_error(rc));
+                    usb_device_get_name(mdev->usb_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",
-            ddf_dev_get_name(mdev->ddf_dev),
+            usb_device_get_name(mdev->usb_dev),
             lun,
             inquiry.product,
@@ -272 +272 @@
         if (rc != EOK) {
                 usb_log_warning("Failed to read capacity, device `%s': %s.\n",
-                    ddf_dev_get_name(mdev->ddf_dev), str_error(rc));
+                    usb_device_get_name(mdev->usb_dev), str_error(rc));
                 rc = EIO;
                 goto error;

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

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

uspace/drv/bus/usb/usbmast/usbmast.h

@@ -43 +43 @@
 /** Mass storage device. */
 typedef struct usbmast_dev {
-        /** DDF device */
-        ddf_dev_t *ddf_dev;
         /** USB device */
         usb_device_t *usb_dev;