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

Fix memory corruption after OHCI reset, by Ed Swierk.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3086 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2007-07-25 16:50:37 +00:00
parent 82d179781b
commit 73221b12ea
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb-ohci.c
View File

@ -120,6 +120,8 @@ struct ohci_hcca {
uint32_t done; uint32_t done;
}; };
static void ohci_bus_stop(OHCIState *ohci);
/* Bitfields for the first word of an Endpoint Desciptor. */ /* Bitfields for the first word of an Endpoint Desciptor. */
#define OHCI_ED_FA_SHIFT 0 #define OHCI_ED_FA_SHIFT 0
#define OHCI_ED_FA_MASK (0x7f<<OHCI_ED_FA_SHIFT) #define OHCI_ED_FA_MASK (0x7f<<OHCI_ED_FA_SHIFT)
@ -344,11 +346,13 @@ static void ohci_attach(USBPort *port1, USBDevice *dev)
} }
/* Reset the controller */ /* Reset the controller */
static void ohci_reset(OHCIState *ohci) static void ohci_reset(void *opaque)
{ {
OHCIState *ohci = opaque;
OHCIPort *port; OHCIPort *port;
int i; int i;
ohci_bus_stop(ohci);
ohci->ctl = 0; ohci->ctl = 0;
ohci->old_ctl = 0; ohci->old_ctl = 0;
ohci->status = 0; ohci->status = 0;
@ -833,6 +837,7 @@ static void ohci_bus_stop(OHCIState *ohci)
{ {
if (ohci->eof_timer) if (ohci->eof_timer)
qemu_del_timer(ohci->eof_timer); qemu_del_timer(ohci->eof_timer);
ohci->eof_timer = NULL;
} }
/* Sets a flag in a port status register but only set it if the port is /* Sets a flag in a port status register but only set it if the port is
@ -918,6 +923,7 @@ static void ohci_set_ctl(OHCIState *ohci, uint32_t val)
dprintf("usb-ohci: %s: USB Resume\n", ohci->name); dprintf("usb-ohci: %s: USB Resume\n", ohci->name);
break; break;
case OHCI_USB_RESET: case OHCI_USB_RESET:
ohci_reset(ohci);
dprintf("usb-ohci: %s: USB Reset\n", ohci->name); dprintf("usb-ohci: %s: USB Reset\n", ohci->name);
break; break;
} }
@ -1291,6 +1297,7 @@ static void usb_ohci_init(OHCIState *ohci, int num_ports, int devfn,
} }
ohci->async_td = 0; ohci->async_td = 0;
qemu_register_reset(ohci_reset, ohci);
ohci_reset(ohci); ohci_reset(ohci);
} }