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

usb-ehci: fix error handling. 

Set the correct bits for nodev, stall and babble errors.
Raise errint irq.  Fix state transition from WRITEBACK
to the next state.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-05-23 09:50:27 +02:00
parent ba7cb5a86a
commit d2bd525fbb
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/usb-ehci.c
View File

@ -1114,10 +1114,10 @@ err:
switch(q->usb_status) { switch(q->usb_status) {
case USB_RET_NODEV: case USB_RET_NODEV:
fprintf(stderr, "USB no device\n"); q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_XACTERR);
ehci_record_interrupt(q->ehci, USBSTS_ERRINT);
break; break;
case USB_RET_STALL: case USB_RET_STALL:
fprintf(stderr, "USB stall\n");
q->qh.token |= QTD_TOKEN_HALT; q->qh.token |= QTD_TOKEN_HALT;
ehci_record_interrupt(q->ehci, USBSTS_ERRINT); ehci_record_interrupt(q->ehci, USBSTS_ERRINT);
break; break;
@ -1133,8 +1133,7 @@ err:
} }
break; break;
case USB_RET_BABBLE: case USB_RET_BABBLE:
fprintf(stderr, "USB babble TODO\n"); q->qh.token |= (QTD_TOKEN_HALT | QTD_TOKEN_BABBLE);
q->qh.token |= QTD_TOKEN_BABBLE;
ehci_record_interrupt(q->ehci, USBSTS_ERRINT); ehci_record_interrupt(q->ehci, USBSTS_ERRINT);
break; break;
default: default:
@ -1792,15 +1791,21 @@ static int ehci_state_writeback(EHCIQueue *q, int async)
put_dwords(NLPTR_GET(q->qtdaddr),(uint32_t *) &q->qh.next_qtd, put_dwords(NLPTR_GET(q->qtdaddr),(uint32_t *) &q->qh.next_qtd,
sizeof(EHCIqtd) >> 2); sizeof(EHCIqtd) >> 2);
/* TODO confirm next state. For now, keep going if async /*
* but stop after one qtd if periodic * EHCI specs say go horizontal here.
*
* We can also advance the queue here for performance reasons. We
* need to take care to only take that shortcut in case we've
* processed the qtd just written back without errors, i.e. halt
* bit is clear.
*/ */
//if (async) { if (q->qh.token & QTD_TOKEN_HALT) {
ehci_set_state(q->ehci, async, EST_HORIZONTALQH);
again = 1;
} else {
ehci_set_state(q->ehci, async, EST_ADVANCEQUEUE); ehci_set_state(q->ehci, async, EST_ADVANCEQUEUE);
again = 1; again = 1;
//} else { }
// ehci_set_state(ehci, async, EST_ACTIVE);
//}
return again; return again;
} }