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

usb-storage: fill status in complete callback. 

Put status word into device state, fill it in command_complete, have
usb_msd_send_status just send it out.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-11-21 11:29:27 +01:00
parent e04da7c3d1
commit 92a114f6f8
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/usb-msd.c
View File

@ -38,6 +38,13 @@ enum USBMSDMode {
USB_MSDM_CSW /* Command Status. */ USB_MSDM_CSW /* Command Status. */
}; };
struct usb_msd_csw {
uint32_t sig;
uint32_t tag;
uint32_t residue;
uint8_t status;
};
typedef struct { typedef struct {
USBDevice dev; USBDevice dev;
enum USBMSDMode mode; enum USBMSDMode mode;
@ -46,6 +53,7 @@ typedef struct {
uint32_t data_len; uint32_t data_len;
uint32_t residue; uint32_t residue;
uint32_t tag; uint32_t tag;
struct usb_msd_csw csw;
SCSIRequest *req; SCSIRequest *req;
SCSIBus bus; SCSIBus bus;
BlockConf conf; BlockConf conf;
@ -67,13 +75,6 @@ struct usb_msd_cbw {
uint8_t cmd[16]; uint8_t cmd[16];
}; };
struct usb_msd_csw {
uint32_t sig;
uint32_t tag;
uint32_t residue;
uint8_t status;
};
enum { enum {
STR_MANUFACTURER = 1, STR_MANUFACTURER = 1,
STR_PRODUCT, STR_PRODUCT,
@ -191,19 +192,15 @@ static void usb_msd_copy_data(MSDState *s, USBPacket *p)
static void usb_msd_send_status(MSDState *s, USBPacket *p) static void usb_msd_send_status(MSDState *s, USBPacket *p)
{ {
struct usb_msd_csw csw;
int len; int len;
DPRINTF("Command status %d tag 0x%x, len %zd\n", DPRINTF("Command status %d tag 0x%x, len %zd\n",
s->result, s->tag, p->iov.size); s->csw.status, s->csw.tag, p->iov.size);
csw.sig = cpu_to_le32(0x53425355);
csw.tag = cpu_to_le32(s->tag);
csw.residue = s->residue;
csw.status = s->result;
len = MIN(sizeof(csw), p->iov.size); assert(s->csw.sig == 0x53425355);
usb_packet_copy(p, &csw, len); len = MIN(sizeof(s->csw), p->iov.size);
p->result = len; usb_packet_copy(p, &s->csw, len);
memset(&s->csw, 0, sizeof(s->csw));
} }
static void usb_msd_transfer_data(SCSIRequest *req, uint32_t len) static void usb_msd_transfer_data(SCSIRequest *req, uint32_t len)
@ -236,6 +233,12 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status)
DPRINTF("Command complete %d\n", status); DPRINTF("Command complete %d\n", status);
s->residue = s->data_len; s->residue = s->data_len;
s->result = status != 0; s->result = status != 0;
s->csw.sig = cpu_to_le32(0x53425355);
s->csw.tag = cpu_to_le32(s->tag);
s->csw.residue = s->residue;
s->csw.status = s->result;
if (s->packet) { if (s->packet) {
if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) { if (s->data_len == 0 && s->mode == USB_MSDM_DATAOUT) {
/* A deferred packet with no write data remaining must be /* A deferred packet with no write data remaining must be
@ -257,6 +260,7 @@ static void usb_msd_command_complete(SCSIRequest *req, uint32_t status)
} else if (s->data_len == 0) { } else if (s->data_len == 0) {
s->mode = USB_MSDM_CSW; s->mode = USB_MSDM_CSW;
} }
scsi_req_unref(req); scsi_req_unref(req);
s->req = NULL; s->req = NULL;
} }