Fix a suspend/resume issue. My Compaq N400c works fine.

This commit is contained in:
Takeshi Shibagaki 2004-01-12 14:18:55 +00:00
parent 3beb62d3d6
commit 7636aa79ab
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=124433
2 changed files with 5 additions and 0 deletions

View File

@ -724,6 +724,9 @@ uhci_power(int why, void *v)
#endif #endif
sc->sc_bus.use_polling++; sc->sc_bus.use_polling++;
sc->sc_suspend = why; sc->sc_suspend = why;
UWRITE2(sc, UHCI_INTR, 0); /* disable interrupts */
uhci_globalreset(sc); /* reset the controller */
uhci_reset(sc);
if (cmd & UHCI_CMD_RS) if (cmd & UHCI_CMD_RS)
uhci_run(sc, 0); /* in case BIOS has started it */ uhci_run(sc, 0); /* in case BIOS has started it */

View File

@ -166,6 +166,8 @@ uhci_pci_resume(device_t self)
{ {
uhci_softc_t *sc = device_get_softc(self); uhci_softc_t *sc = device_get_softc(self);
pci_write_config(self, PCI_LEGSUP, PCI_LEGSUP_USBPIRQDEN, 2);
uhci_power(PWR_RESUME, sc); uhci_power(PWR_RESUME, sc);
bus_generic_resume(self); bus_generic_resume(self);