View | Details | Raw Unified | Return to bug 33004 | Differences between
and this patch

Collapse All | Expand All

(-)uhci_pci.c (+11 lines)
Lines 125-132 Link Here
125
uhci_pci_resume(device_t self)
125
uhci_pci_resume(device_t self)
126
{
126
{
127
	uhci_softc_t *sc = device_get_softc(self);
127
	uhci_softc_t *sc = device_get_softc(self);
128
	u_int32_t csr;
128
129
129
	uhci_power(PWR_RESUME, sc);
130
	uhci_power(PWR_RESUME, sc);
131
	/* Enable the device. */
132
	csr = pci_read_config(self, PCI_COMMAND_STATUS_REG, 4);
133
	pci_write_config(self, PCI_COMMAND_STATUS_REG, 
134
		csr | PCIM_CMD_BUSMASTEREN, 4);
130
	bus_generic_resume(self);
135
	bus_generic_resume(self);
131
136
132
	return 0;
137
	return 0;
Lines 182-187 Link Here
182
	uhci_softc_t *sc = device_get_softc(self);
187
	uhci_softc_t *sc = device_get_softc(self);
183
	int rid;
188
	int rid;
184
	int err;
189
	int err;
190
	u_int32_t csr;
185
191
186
	rid = PCI_UHCI_BASE_REG;
192
	rid = PCI_UHCI_BASE_REG;
187
	sc->io_res = bus_alloc_resource(self, SYS_RES_IOPORT, &rid,
193
	sc->io_res = bus_alloc_resource(self, SYS_RES_IOPORT, &rid,
Lines 275-280 Link Here
275
		uhci_pci_detach(self);
281
		uhci_pci_detach(self);
276
		return ENXIO;
282
		return ENXIO;
277
	}
283
	}
284
285
	/* Enable the device. */
286
	csr = pci_read_config(self, PCI_COMMAND_STATUS_REG, 4);
287
	pci_write_config(self, PCI_COMMAND_STATUS_REG, 
288
		csr | PCIM_CMD_BUSMASTEREN, 4);
278
289
279
	/* Set the PIRQD enable bit and switch off all the others. We don't
290
	/* Set the PIRQD enable bit and switch off all the others. We don't
280
	 * want legacy support to interfere with us
291
	 * want legacy support to interfere with us

Return to bug 33004