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

usb-uhci: process uhci_handle_td return code via switch. 

Restruct the uhci_handle_td return code processing to make the
control flow more clear and the code more readable.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-01-27 16:38:42 +01:00
parent f8af1e889b
commit 971a5a406e
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
hw/usb-uhci.c
View File

@ -1029,49 +1029,61 @@ static void uhci_process_frame(UHCIState *s)
pci_dma_write(&s->dev, (link & ~0xf) + 4, &val, sizeof(val)); pci_dma_write(&s->dev, (link & ~0xf) + 4, &val, sizeof(val));
} }
if (ret < 0) { switch (ret) {
/* interrupted frame */ case -1: /* interrupted frame */
break; goto out;
}
if (ret == 2 || ret == 1) {
DPRINTF("uhci: TD 0x%x %s. link 0x%x ctrl 0x%x token 0x%x qh 0x%x\n",
link, ret == 2 ? "pend" : "skip",
td.link, td.ctrl, td.token, curr_qh);
case 1: /* goto next queue */
DPRINTF("uhci: TD 0x%x skip. "
"link 0x%x ctrl 0x%x token 0x%x qh 0x%x\n",
link, td.link, td.ctrl, td.token, curr_qh);
link = curr_qh ? qh.link : td.link; link = curr_qh ? qh.link : td.link;
continue; continue;
}
/* completed TD */ case 2: /* got USB_RET_ASYNC */
DPRINTF("uhci: TD 0x%x async. "
"link 0x%x ctrl 0x%x token 0x%x qh 0x%x\n",
link, td.link, td.ctrl, td.token, curr_qh);
fprintf(stderr, "async td: link %x%s\n",
td.link, is_valid(td.link) ? " valid" : "");
link = curr_qh ? qh.link : td.link;
continue;
DPRINTF("uhci: TD 0x%x done. link 0x%x ctrl 0x%x token 0x%x qh 0x%x\n", case 0: /* completed TD */
link, td.link, td.ctrl, td.token, curr_qh); DPRINTF("uhci: TD 0x%x done. "
"link 0x%x ctrl 0x%x token 0x%x qh 0x%x\n",
link, td.link, td.ctrl, td.token, curr_qh);
link = td.link; link = td.link;
td_count++; td_count++;
bytes_count += (td.ctrl & 0x7ff) + 1; bytes_count += (td.ctrl & 0x7ff) + 1;
if (curr_qh) { if (curr_qh) {
/* update QH element link */ /* update QH element link */
qh.el_link = link; qh.el_link = link;
val = cpu_to_le32(qh.el_link); val = cpu_to_le32(qh.el_link);
pci_dma_write(&s->dev, (curr_qh & ~0xf) + 4, &val, sizeof(val)); pci_dma_write(&s->dev, (curr_qh & ~0xf) + 4, &val, sizeof(val));
if (!depth_first(link)) { if (!depth_first(link)) {
/* done with this QH */ /* done with this QH */
DPRINTF("uhci: QH 0x%x done. link 0x%x elink 0x%x\n", DPRINTF("uhci: QH 0x%x done. link 0x%x elink 0x%x\n",
curr_qh, qh.link, qh.el_link); curr_qh, qh.link, qh.el_link);
curr_qh = 0; curr_qh = 0;
link = qh.link; link = qh.link;
}
} }
break;
default:
assert(!"unknown return code");
} }
/* go to the next entry */ /* go to the next entry */
} }
out:
s->pending_int_mask |= int_mask; s->pending_int_mask |= int_mask;
} }