diff mbox series

[v2,08/15] sandbox: scsi: Move file size into shared struct

Message ID 20220921142147.1083886-9-sjg@chromium.org
State Accepted
Commit f148ad1b5fb14a3295ced502647de5be69e46100
Delegated to: Simon Glass
Headers show
Series scsi: Convert sandbox SCSI to driver model | expand

Commit Message

Simon Glass Sept. 21, 2022, 2:21 p.m. UTC 
Move this information into struct scsi_emul_info so we can use it in
common code.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

 drivers/usb/emul/sandbox_flash.c | 7 +++----
 include/scsi_emul.h              | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/drivers/usb/emul/sandbox_flash.c b/drivers/usb/emul/sandbox_flash.c
index e4a8eb2e988..3c5bc675e3c 100644
--- a/drivers/usb/emul/sandbox_flash.c
+++ b/drivers/usb/emul/sandbox_flash.c
@@ -49,7 +49,6 @@  struct sandbox_flash_priv {
 	bool error;
 	u32 tag;
 	int fd;
-	loff_t file_size;
 	struct umass_bbb_csw status;
 };
 
@@ -258,8 +257,8 @@  static int handle_ufi_command(struct sandbox_flash_plat *plat,
 		struct scsi_read_capacity_resp *resp = (void *)info->buff;
 		uint blocks;
 
-		if (priv->file_size)
-			blocks = priv->file_size / info->block_size - 1;
+		if (info->file_size)
+			blocks = info->file_size / info->block_size - 1;
 		else
 			blocks = 0;
 		resp->last_block_addr = cpu_to_be32(blocks);
@@ -395,7 +394,7 @@  static int sandbox_flash_probe(struct udevice *dev)
 
 	priv->fd = os_open(plat->pathname, OS_O_RDONLY);
 	if (priv->fd != -1) {
-		ret = os_get_filesize(plat->pathname, &priv->file_size);
+		ret = os_get_filesize(plat->pathname, &info->file_size);
 		if (ret)
 			return log_msg_ret("sz", ret);
 	}
diff --git a/include/scsi_emul.h b/include/scsi_emul.h
index 86c9379ca9e..3c52398e3ff 100644
--- a/include/scsi_emul.h
+++ b/include/scsi_emul.h
@@ -18,6 +18,7 @@ 
  * @vendor: Vendor name
  * @product: Product name
  * @block_size: Block size of device in bytes (normally 512)
+ * @file_size: Size of the backing file for this emulator, in bytes
  *
  * @phase: Current SCSI phase
  * @buff_used: Number of bytes ready to transfer back to host
@@ -32,6 +33,7 @@  struct scsi_emul_info {
 	const char *vendor;
 	const char *product;
 	int block_size;
+	loff_t file_size;
 
 	/* state maintained by the emulator: */
 	enum scsi_cmd_phase phase;