mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't clear pending interrupt bits when setting the new status

Browse Source
This commit is contained in:
Volker Ruppert 2012-06-21 17:06:57 +00:00
parent 40a61d9d23
commit 40f33ff8c2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/iodev/usb/usb_uhci.cc
View File

@ -832,7 +832,7 @@ void bx_usb_uhci_c::usb_timer(void)
// set the status register bit:0 to 1 if SPD is enabled // set the status register bit:0 to 1 if SPD is enabled
// and if interrupts not masked via interrupt register, raise irq interrupt. // and if interrupts not masked via interrupt register, raise irq interrupt.
BX_UHCI_THIS hub.usb_status.status2 = (shortpacket) ? 2 : 0; if (shortpacket) BX_UHCI_THIS hub.usb_status.status2 |= 2;
if (shortpacket && BX_UHCI_THIS hub.usb_enable.short_packet) { if (shortpacket && BX_UHCI_THIS hub.usb_enable.short_packet) {
BX_DEBUG((" [SPD] We want it to fire here (Frame: %04i)", BX_UHCI_THIS hub.usb_frame_num.frame_num)); BX_DEBUG((" [SPD] We want it to fire here (Frame: %04i)", BX_UHCI_THIS hub.usb_frame_num.frame_num));
} }
@ -845,7 +845,7 @@ void bx_usb_uhci_c::usb_timer(void)
BX_DEBUG((" [IOC] We want it to fire here (Frame: %04i)", BX_UHCI_THIS hub.usb_frame_num.frame_num)); BX_DEBUG((" [IOC] We want it to fire here (Frame: %04i)", BX_UHCI_THIS hub.usb_frame_num.frame_num));
} }
BX_UHCI_THIS hub.usb_status.error_interrupt = stalled; BX_UHCI_THIS hub.usb_status.error_interrupt |= stalled;
if (stalled && BX_UHCI_THIS hub.usb_enable.timeout_crc) { if (stalled && BX_UHCI_THIS hub.usb_enable.timeout_crc) {
BX_DEBUG((" [stalled] We want it to fire here (Frame: %04i)", BX_UHCI_THIS hub.usb_frame_num.frame_num)); BX_DEBUG((" [stalled] We want it to fire here (Frame: %04i)", BX_UHCI_THIS hub.usb_frame_num.frame_num));
} }
@ -856,7 +856,7 @@ void bx_usb_uhci_c::usb_timer(void)
BX_UHCI_THIS hub.usb_frame_num.frame_num &= (1024-1); BX_UHCI_THIS hub.usb_frame_num.frame_num &= (1024-1);
// The status.interrupt bit should be set regardless of the enable bits if a IOC or SPD is found // The status.interrupt bit should be set regardless of the enable bits if a IOC or SPD is found
if (BX_UHCI_THIS hub.usb_status.status2 != 0) { if (interrupt || shortpacket) {
BX_UHCI_THIS hub.usb_status.interrupt = 1; BX_UHCI_THIS hub.usb_status.interrupt = 1;
} }
// if we needed to fire an interrupt now, lets do it *after* we increment the frame_num register // if we needed to fire an interrupt now, lets do it *after* we increment the frame_num register