random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-18 14:48:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: scsi: Move reply setup out of helper

Browse Source 
Move this code out of the helper function so we can (later) add it as part
of the shared emulation code. Set a default value of 0 for buff_used since
that is what we use when there is an error.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-09-21 16:21:41 +02:00
parent f148ad1b5f
commit f75b6f76a4
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/emul/sandbox_flash.c
View File

@ -181,14 +181,12 @@ static int sandbox_flash_control(struct udevice *dev, struct usb_device *udev,
static void setup_fail_response(struct sandbox_flash_priv *priv) static void setup_fail_response(struct sandbox_flash_priv *priv)
{ {
struct scsi_emul_info *info = &priv->eminfo;
struct umass_bbb_csw *csw = &priv->status; struct umass_bbb_csw *csw = &priv->status;
csw->dCSWSignature = CSWSIGNATURE; csw->dCSWSignature = CSWSIGNATURE;
csw->dCSWTag = priv->tag; csw->dCSWTag = priv->tag;
csw->dCSWDataResidue = 0; csw->dCSWDataResidue = 0;
csw->bCSWStatus = CSWSTATUS_FAILED; csw->bCSWStatus = CSWSTATUS_FAILED;
info->buff_used = 0;
} }
/** /**
@ -198,19 +196,14 @@ static void setup_fail_response(struct sandbox_flash_priv *priv)
* @resp: Response to send, or NULL if none * @resp: Response to send, or NULL if none
* @size: Size of response * @size: Size of response
*/ */
static void setup_response(struct sandbox_flash_priv *priv, void *resp, static void setup_response(struct sandbox_flash_priv *priv)
int size)
{ {
struct scsi_emul_info *info = &priv->eminfo;
struct umass_bbb_csw *csw = &priv->status; struct umass_bbb_csw *csw = &priv->status;
csw->dCSWSignature = CSWSIGNATURE; csw->dCSWSignature = CSWSIGNATURE;
csw->dCSWTag = priv->tag; csw->dCSWTag = priv->tag;
csw->dCSWDataResidue = 0; csw->dCSWDataResidue = 0;
csw->bCSWStatus = CSWSTATUS_GOOD; csw->bCSWStatus = CSWSTATUS_GOOD;
assert(!resp || resp == info->buff);
info->buff_used = size;
} }
static void handle_read(struct sandbox_flash_priv *priv, ulong lba, static void handle_read(struct sandbox_flash_priv *priv, ulong lba,
@ -222,8 +215,8 @@ static void handle_read(struct sandbox_flash_priv *priv, ulong lba,
info->read_len = transfer_len; info->read_len = transfer_len;
if (priv->fd != -1) { if (priv->fd != -1) {
os_lseek(priv->fd, lba * info->block_size, OS_SEEK_SET); os_lseek(priv->fd, lba * info->block_size, OS_SEEK_SET);
setup_response(priv, info->buff, info->buff_used = transfer_len * info->block_size;
transfer_len * info->block_size); setup_response(priv);
} else { } else {
setup_fail_response(priv); setup_fail_response(priv);
} }
@ -236,6 +229,7 @@ static int handle_ufi_command(struct sandbox_flash_plat *plat,
struct scsi_emul_info *info = &priv->eminfo; struct scsi_emul_info *info = &priv->eminfo;
const struct scsi_cmd *req = buff; const struct scsi_cmd *req = buff;
info->buff_used = 0;
switch (*req->cmd) { switch (*req->cmd) {
case SCSI_INQUIRY: { case SCSI_INQUIRY: {
struct scsi_inquiry_resp *resp = (void *)info->buff; struct scsi_inquiry_resp *resp = (void *)info->buff;
@ -247,11 +241,12 @@ static int handle_ufi_command(struct sandbox_flash_plat *plat,
strncpy(resp->vendor, info->vendor, sizeof(resp->vendor)); strncpy(resp->vendor, info->vendor, sizeof(resp->vendor));
strncpy(resp->product, info->product, sizeof(resp->product)); strncpy(resp->product, info->product, sizeof(resp->product));
strncpy(resp->revision, "1.0", sizeof(resp->revision)); strncpy(resp->revision, "1.0", sizeof(resp->revision));
setup_response(priv, resp, sizeof(*resp)); info->buff_used = sizeof(*resp);
setup_response(priv);
break; break;
} }
case SCSI_TST_U_RDY: case SCSI_TST_U_RDY:
setup_response(priv, NULL, 0); setup_response(priv);
break; break;
case SCSI_RD_CAPAC: { case SCSI_RD_CAPAC: {
struct scsi_read_capacity_resp *resp = (void *)info->buff; struct scsi_read_capacity_resp *resp = (void *)info->buff;
@ -263,7 +258,8 @@ static int handle_ufi_command(struct sandbox_flash_plat *plat,
blocks = 0; blocks = 0;
resp->last_block_addr = cpu_to_be32(blocks); resp->last_block_addr = cpu_to_be32(blocks);
resp->block_len = cpu_to_be32(info->block_size); resp->block_len = cpu_to_be32(info->block_size);
setup_response(priv, resp, sizeof(*resp)); info->buff_used = sizeof(*resp);
setup_response(priv);
break; break;
} }
case SCSI_READ10: { case SCSI_READ10: {