Changeset 8e7c9fe in mainline for uspace/drv/bus/usb/usbmast

Timestamp:

2014-09-12T03:45:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:

uspace/drv/bus/usb/usbmast

Files:

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

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

@@ -43 +43 @@
 #include <usb/dev/driver.h>
 #include "usbmast.h"
-
-#define BULK_IN_EP 0
-#define BULK_OUT_EP 1
 
 typedef enum cmd_status {

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

@@ -82 +82 @@
 static int usbmast_bd_close(bd_srv_t *);
 static int usbmast_bd_read_blocks(bd_srv_t *, aoff64_t, size_t, void *, size_t);
+static int usbmast_bd_sync_cache(bd_srv_t *, aoff64_t, size_t);
 static int usbmast_bd_write_blocks(bd_srv_t *, aoff64_t, size_t, const void *, size_t);
 static int usbmast_bd_get_block_size(bd_srv_t *, size_t *);
@@ -90 +91 @@
         .close = usbmast_bd_close,
         .read_blocks = usbmast_bd_read_blocks,
+        .sync_cache = usbmast_bd_sync_cache,
         .write_blocks = usbmast_bd_write_blocks,
         .get_block_size = usbmast_bd_get_block_size,
@@ -344 +346 @@
 }
 
+/** Synchronize blocks to nonvolatile storage. */
+static int usbmast_bd_sync_cache(bd_srv_t *bd, uint64_t ba, size_t cnt)
+{
+        usbmast_fun_t *mfun = bd_srv_usbmast(bd);
+
+        return usbmast_sync_cache(mfun, ba, cnt);
+}
+
 /** Write blocks to the device. */
 static int usbmast_bd_write_blocks(bd_srv_t *bd, uint64_t ba, size_t cnt,

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

@@ -383 +383 @@
 }
 
+/** Perform SCSI Synchronize Cache command on USB mass storage device.
+ *
+ * @param mfun          Mass storage function
+ * @param ba            Address of first block
+ * @param nblocks       Number of blocks to read
+ * @param data          Data to write
+ *
+ * @return              Error code
+ */
+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;
+
+        if (nblocks > UINT16_MAX)
+                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);
+
+        if (rc != EOK) {
+                usb_log_error("Synchronize Cache (10) transport failed, device %s: %s.\n",
+                   usb_device_get_name(mfun->mdev->usb_dev), str_error(rc));
+                return rc;
+        }
+
+        if (cmd.status != CMDS_GOOD) {
+                usb_log_error("Synchronize Cache (10) command failed, device %s.\n",
+                   usb_device_get_name(mfun->mdev->usb_dev));
+                return EIO;
+        }
+
+        return EOK;
+}
+
 /**
  * @}

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

@@ -64 +64 @@
 extern int usbmast_read(usbmast_fun_t *, uint64_t, size_t, void *);
 extern int usbmast_write(usbmast_fun_t *, uint64_t, size_t, const void *);
+extern int usbmast_sync_cache(usbmast_fun_t *, uint64_t, size_t);
 extern const char *usbmast_scsi_dev_type_str(unsigned);