diff options
| author | se <se@FreeBSD.org> | 1995-10-09 21:56:24 +0000 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 1995-10-09 21:56:24 +0000 |
| commit | d1c61dd19dc5091fe70ee43150b965d89182cb29 (patch) | |
| tree | f73ea70b38b0047b07a05fb67a298b85e6b299c9 /sys/i386/isa/pcibus.c | |
| parent | 1b4761e6b2785c1f95adba0794cbb4f6ae69629a (diff) | |
| download | FreeBSD-src-d1c61dd19dc5091fe70ee43150b965d89182cb29.zip FreeBSD-src-d1c61dd19dc5091fe70ee43150b965d89182cb29.tar.gz | |
Fix bad typo: CONF1_ENABLE_RES1 was written CONF1_ENABLE_CHK1 ...
Diffstat (limited to 'sys/i386/isa/pcibus.c')
| -rw-r--r-- | sys/i386/isa/pcibus.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c index cd8353d..14c020f 100644 --- a/sys/i386/isa/pcibus.c +++ b/sys/i386/isa/pcibus.c @@ -1,6 +1,6 @@ /************************************************************************** ** -** $Id: pcibus.c,v 1.14 1995/09/18 21:48:39 se Exp $ +** $Id: pcibus.c,v 1.15 1995/09/22 19:10:54 se Exp $ ** ** pci bus subroutines for i386 architecture. ** @@ -164,13 +164,17 @@ pcibus_check (void) if (bootverbose) printf ("pcibus_check:\tdevice "); for (device = 0; device < pci_maxdevice; device++) { - if (bootverbose) printf ("%d ", device); - if (pcibus_read (pcibus_tag (0,device,0), 0) != 0xfffffffful) { - if (bootverbose) printf ("is there\n"); + unsigned long id; + if (bootverbose) + printf ("%d ", device); + id = pcibus_read (pcibus_tag (0,device,0), 0); + if (id != 0xfffffffful) { + if (bootverbose) printf ("is there (id=%08lx)\n", id); return 1; } } - if (bootverbose) printf ("-- nothing found\n"); + if (bootverbose) + printf ("-- nothing found\n"); return 0; } @@ -185,6 +189,7 @@ pcibus_setup (void) outb (CONF2_ENABLE_PORT, CONF2_ENABLE_CHK); mode1res = inl(CONF1_ADDR_PORT); mode2res = inb(CONF2_ENABLE_PORT); + outb (CONF2_ENABLE_PORT, 0); outl (CONF1_ADDR_PORT, oldval); if (bootverbose) { @@ -234,7 +239,7 @@ pcibus_setup (void) printf ("pcibus_setup(3):\tmode1res=0x%08lx (0x%08lx)\n", mode1res, CONF1_ENABLE_CHK1); - if ((mode1res & CONF1_ENABLE_MSK1) == CONF1_ENABLE_CHK1) { + if ((mode1res & CONF1_ENABLE_MSK1) == CONF1_ENABLE_RES1) { if (pcibus_check()) return; }; @@ -244,6 +249,9 @@ pcibus_setup (void) **--------------------------------------- */ + if (bootverbose) + printf ("pcibus_setup(4):\tnow trying mechanism 2\n"); + pci_mechanism = 2; pci_maxdevice = 16; |
