ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi-bus: Add MAINTENANCE_IN and MAINTENANCE_OUT SCSIRequest xfer and mode assignments 

This patch updates hw/scsi-bus.c to add MAINTENANCE_IN and MAINTENANCE_OUT case in
scsi_req_length() for TYPE_ROM with MMC commands.  It also adds the MAINTENANCE_OUT
case in scsi_req_xfer_mode() to set SCSI_XFER_TO_DEV for outgoing write data.

Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Nicholas Bellinger 2010-06-16 06:43:06 -07:00 committed by Kevin Wolf
parent 01bedebaaf
commit c7126d5b32
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/scsi-bus.c
View File

@ -242,6 +242,13 @@ static int scsi_req_length(SCSIRequest *req, uint8_t *cmd)
case INQUIRY: case INQUIRY:
req->cmd.xfer = cmd[4] | (cmd[3] << 8); req->cmd.xfer = cmd[4] | (cmd[3] << 8);
break; break;
case MAINTENANCE_OUT:
case MAINTENANCE_IN:
if (req->dev->type == TYPE_ROM) {
/* GPCMD_REPORT_KEY and GPCMD_SEND_KEY from multi media commands */
req->cmd.xfer = cmd[9] | (cmd[8] << 8);
}
break;
} }
return 0; return 0;
} }
@ -307,6 +314,7 @@ static void scsi_req_xfer_mode(SCSIRequest *req)
case SEND_VOLUME_TAG: case SEND_VOLUME_TAG:
case WRITE_LONG_2: case WRITE_LONG_2:
case PERSISTENT_RESERVE_OUT: case PERSISTENT_RESERVE_OUT:
case MAINTENANCE_OUT:
req->cmd.mode = SCSI_XFER_TO_DEV; req->cmd.mode = SCSI_XFER_TO_DEV;
break; break;
default: default:
@ -387,6 +395,8 @@ static const char *scsi_command_name(uint8_t cmd)
[ SPACE ] = "SPACE", [ SPACE ] = "SPACE",
[ INQUIRY ] = "INQUIRY", [ INQUIRY ] = "INQUIRY",
[ RECOVER_BUFFERED_DATA ] = "RECOVER_BUFFERED_DATA", [ RECOVER_BUFFERED_DATA ] = "RECOVER_BUFFERED_DATA",
[ MAINTENANCE_IN ] = "MAINTENANCE_IN",
[ MAINTENANCE_OUT ] = "MAINTENANCE_OUT",
[ MODE_SELECT ] = "MODE_SELECT", [ MODE_SELECT ] = "MODE_SELECT",
[ RESERVE ] = "RESERVE", [ RESERVE ] = "RESERVE",
[ RELEASE ] = "RELEASE", [ RELEASE ] = "RELEASE",

2
hw/scsi-defs.h
View File

@ -84,6 +84,8 @@
#define MODE_SENSE_10 0x5a #define MODE_SENSE_10 0x5a
#define PERSISTENT_RESERVE_IN 0x5e #define PERSISTENT_RESERVE_IN 0x5e
#define PERSISTENT_RESERVE_OUT 0x5f #define PERSISTENT_RESERVE_OUT 0x5f
#define MAINTENANCE_IN 0xa3
#define MAINTENANCE_OUT 0xa4
#define MOVE_MEDIUM 0xa5 #define MOVE_MEDIUM 0xa5
#define READ_12 0xa8 #define READ_12 0xa8
#define WRITE_12 0xaa #define WRITE_12 0xaa