diff options
| author | Doug Rabson <dfr@FreeBSD.org> | 1999-05-30 11:12:30 +0000 |
|---|---|---|
| committer | Doug Rabson <dfr@FreeBSD.org> | 1999-05-30 11:12:30 +0000 |
| commit | f7f2df54bbae7a2203b56b6a2f248db3e2451110 (patch) | |
| tree | 5c9c4fe8bf48d89a5931b98f587ab9ca6c5274e8 /sys/dev | |
| parent | d384956496022d3affe95dfce1df19896f0f3e0b (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/atkbdc/atkbdc_isa.c | 6 | ||||
| -rw-r--r-- | sys/dev/atkbdc/atkbdc_subr.c | 6 | ||||
| -rw-r--r-- | sys/dev/fdc/fdc.c | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index 2ac252536ce3b..22a2cbd2d34e7 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbdc_isa.c,v 1.6 1999/05/18 11:33:14 yokota Exp $ + * $Id: atkbdc_isa.c,v 1.7 1999/05/22 15:47:33 dfr Exp $ */ #include "atkbdc.h" @@ -97,6 +97,10 @@ atkbdc_probe(device_t dev) int rid; struct resource *port; + /* Check isapnp ids */ + if (isa_get_vendorid(dev)) + return (ENXIO); + device_set_desc(dev, "keyboard controller (i8042)"); rid = 0; port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index 2ac252536ce3b..22a2cbd2d34e7 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbdc_isa.c,v 1.6 1999/05/18 11:33:14 yokota Exp $ + * $Id: atkbdc_isa.c,v 1.7 1999/05/22 15:47:33 dfr Exp $ */ #include "atkbdc.h" @@ -97,6 +97,10 @@ atkbdc_probe(device_t dev) int rid; struct resource *port; + /* Check isapnp ids */ + if (isa_get_vendorid(dev)) + return (ENXIO); + device_set_desc(dev, "keyboard controller (i8042)"); rid = 0; port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 35cc34ce572d5..cc51f9338364e 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.142 1999/05/08 21:59:24 dfr Exp $ + * $Id: fd.c,v 1.143 1999/05/11 04:58:30 bde Exp $ * */ @@ -86,7 +86,6 @@ #include <isa/isavar.h> #include <i386/isa/isa.h> -#include <i386/isa/isa_dma.h> #include <i386/isa/fdreg.h> #include <i386/isa/fdc.h> #include <i386/isa/rtc.h> @@ -757,6 +756,10 @@ fd_probe(device_t dev) static int fd_fifo = 0; #endif + /* No pnp support */ + if (isa_get_vendorid(dev)) + return (ENXIO); + fdsu = *(int *)device_get_ivars(dev); /* xxx cheat a bit... */ fd = device_get_softc(dev); fdc = device_get_softc(device_get_parent(dev)); |