Changeset 83062ff in mainline

Timestamp:

2014-09-12T05:30:31Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fa65df1

Parents:

c53b58e

Message:

usbmast: bit more cleanup and some const love

Location:

uspace/drv/bus/usb/usbmast

Files:

• bo_trans.h (modified) (1 diff)
• scsi_ms.c (modified) (2 diffs)

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

@@ -60 +60 @@
 
         /** Command Descriptor Block */
-        void *cdb;
+        const void *cdb;
         /** CDB size in bytes */
         size_t cdb_size;

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

@@ -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) {