Changes in uspace/drv/bus/usb/usbmast/scsi_ms.c [dd8b6a8:83062ff] in mainline

File:

• uspace/drv/bus/usb/usbmast/scsi_ms.c (modified) (14 diffs)

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;
         }
@@ -394 +394 @@
 int usbmast_sync_cache(usbmast_fun_t *mfun, uint64_t ba, size_t nblocks)
 {
-        scsi_cmd_t cmd;
-        scsi_cdb_sync_cache_10_t cdb;
-        int rc;
-
         if (ba > UINT32_MAX)
                 return ELIMIT;
@@ -404 +400 @@
                 return ELIMIT;
 
-        memset(&cdb, 0, sizeof(cdb));
-        cdb.op_code = SCSI_CMD_SYNC_CACHE_10;
-        cdb.lba = host2uint32_t_be(ba);
-        cdb.numlb = host2uint16_t_be(nblocks);
-
-        memset(&cmd, 0, sizeof(cmd));
-        cmd.cdb = &cdb;
-        cmd.cdb_size = sizeof(cdb);
-
-        rc = usbmast_run_cmd(mfun, &cmd);
+        const scsi_cdb_sync_cache_10_t cdb = {
+                .op_code = SCSI_CMD_SYNC_CACHE_10,
+                .lba = host2uint32_t_be(ba),
+                .numlb = host2uint16_t_be(nblocks),
+        };
+
+        scsi_cmd_t cmd = {
+                .cdb = &cdb,
+                .cdb_size = sizeof(cdb),
+        };
+
+        const int rc = usbmast_run_cmd(mfun, &cmd);
 
         if (rc != EOK) {
                 usb_log_error("Synchronize Cache (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;
         }
@@ -423 +421 @@
         if (cmd.status != CMDS_GOOD) {
                 usb_log_error("Synchronize Cache (10) command failed, device %s.\n",
-                   ddf_dev_get_name(mfun->mdev->ddf_dev));
+                   usb_device_get_name(mfun->mdev->usb_dev));
                 return EIO;
         }