diff options
| author | peter <peter@FreeBSD.org> | 1999-04-16 21:22:55 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-04-16 21:22:55 +0000 |
| commit | 087d4857e56f150a8f549600150404f273efb895 (patch) | |
| tree | cf4e27432c59d956f4e5784207180115ee8fef9d /sys/pci/ide_pci.c | |
| parent | c5fe612b8411a32a8e6e426fc1a70cba0cca3d31 (diff) | |
| download | FreeBSD-src-087d4857e56f150a8f549600150404f273efb895.zip FreeBSD-src-087d4857e56f150a8f549600150404f273efb895.tar.gz | |
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
Diffstat (limited to 'sys/pci/ide_pci.c')
| -rw-r--r-- | sys/pci/ide_pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c index 524b873..6faef01 100644 --- a/sys/pci/ide_pci.c +++ b/sys/pci/ide_pci.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ide_pci.c,v 1.30 1999/04/13 19:38:12 peter Exp $ + * $Id: ide_pci.c,v 1.31 1999/04/13 20:22:33 peter Exp $ */ #include "pci.h" @@ -1514,6 +1514,7 @@ ide_pci_attach(pcici_t tag, int unit) wddma[unit].wdd_iobase = ide_pci_iobase; wddma[unit].wdd_altiobase = ide_pci_altiobase; +#if 0 /* * This code below is mighty bogus. The config entries for the * isa_devtab_bio are plugged in before the standard ISA bios scan. @@ -1582,7 +1583,7 @@ ide_pci_attach(pcici_t tag, int unit) } } } - +#endif bmista_1 = inb(iobase_bm_1 + BMISTA_PORT); bmista_2 = inb(iobase_bm_2 + BMISTA_PORT); |
