github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-17 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

DM USB: introduce enum type usb_block_type

Browse Source 
In the process of USB data transfer, there three kinds of data blocks:
a. Non data block, which contains some control information;
b. Partial data block, which contains part of a large data chunk;
c. Full data block, which contains a complete data chunk.

In previous implementation, the differences mentioned above are described
by the usb_block::chained. But the 'chained' is concept in the xHCI area
and should not appear in the USB layer. This patch introduces enum type
usb_block_type to replace the 'chained' field in struct usb_block.

Tracked-On: #3628
Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Xiaoguang Wu
2019-09-09 11:23:03 +08:00
committed by wenlingz
parent 7445e404a8
commit 236c23e418
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
devicemodel/hw/platform/usb_pmapper.c
View File

@@ -274,7 +274,8 @@ usb_dev_comp_cb(struct libusb_transfer *trn)
if (d > block->blen)
d = block->blen;
if (block->buf) {
if (block->type == USB_DATA_PART ||
block->type == USB_DATA_FULL) {
if (r->in == TOKEN_IN) {
memcpy(block->buf, buf + buf_idx, d);
buf_idx += d;
@@ -292,7 +293,7 @@ usb_dev_comp_cb(struct libusb_transfer *trn)
idx = (idx + 1) % USB_MAX_XFER_BLOCKS;
i++;
} while (block->chained == 1);
} while (block->type == USB_DATA_PART);
}
stall_out:
@@ -386,14 +387,15 @@ usb_dev_prepare_xfer(struct usb_xfer *xfer, int *count, int *size)
idx = (idx + 1) % USB_MAX_XFER_BLOCKS;
continue;
}
if (block->buf && block->blen > 0) {
if (block->type == USB_DATA_PART ||
block->type == USB_DATA_FULL) {
if (!found) {
found = 1;
first = idx;
}
c++;
s += block->blen;
} else if (!block->buf || !block->blen) {
} else if (block->type == USB_DATA_NONE) {
/* there are two cases:
* 1. LINK trb is in the middle of trbs.
* 2. LINK trb is a single trb.
@@ -801,7 +803,7 @@ usb_dev_data(void *pdata, struct usb_xfer *xfer, int dir, int epctx)
continue;
}
if (xfer->data[idx].chained == 1) {
if (xfer->data[idx].type == USB_DATA_PART) {
idx = (idx + 1) % USB_MAX_XFER_BLOCKS;
continue;
}
@@ -838,7 +840,8 @@ usb_dev_data(void *pdata, struct usb_xfer *xfer, int dir, int epctx)
if (!dir) {
for (i = 0, j = 0, buf_idx = 0; j < blk_count; ++i) {
b = &xfer->data[(blk_start + i) % USB_MAX_XFER_BLOCKS];
if (b->buf) {
if (b->type == USB_DATA_FULL ||
b->type == USB_DATA_PART) {
memcpy(&r->buffer[buf_idx], b->buf, b->blen);
buf_idx += b->blen;
j++;
@@ -850,13 +853,13 @@ usb_dev_data(void *pdata, struct usb_xfer *xfer, int dir, int epctx)
for (i = 0, j = 0, idx = blk_start; i < blk_count; ++i) {
int len = xfer->data[idx].blen;
if (len <= 0) {
if (xfer->data[idx].type == USB_DATA_NONE) {
idx = (idx + 1) % USB_MAX_XFER_BLOCKS;
i--;
continue;
}
if (xfer->data[idx].chained == 1) {
if (xfer->data[idx].type == USB_DATA_PART) {
r->trn->iso_packet_desc[j].length += len;
idx = (idx + 1) % USB_MAX_XFER_BLOCKS;
continue;