Bring the 'new-bus' to the i386. This extensively changes the way the

i386 platform boots, it is no longer ISA-centric, and is fully dynamic.
Most old drivers compile and run without modification via 'compatability
shims' to enable a smoother transition.  eisa, isapnp and pccard* are
not yet using the new resource manager.  Once fully converted, all drivers
will be loadable, including PCI and ISA.

(Some other changes appear to have snuck in, including a port of Soren's
 ATA driver to the Alpha.  Soren, back this out if you need to.)

This is a checkpoint of work-in-progress, but is quite functional.

The bulk of the work was done over the last few years by Doug Rabson and
Garrett Wollman.

Approved by:	core

1 files changed, 2 insertions, 1 deletions

diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index 2171374..89fed85 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -125,7 +125,8 @@ typedef struct uhci_softc {
 	bus_dma_tag_t sc_dmatag;	/* DMA tag */
 	/* XXX should keep track of all DMA memory */
 #elif defined(__FreeBSD__)
-	int		sc_iobase;
+	bus_space_tag_t iot;
+	bus_space_handle_t ioh;
 #endif /* defined(__FreeBSD__) */
 
 	uhci_physaddr_t *sc_pframes;