summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/atkbdc/atkbdc_isa.c6
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.c6
-rw-r--r--sys/dev/fdc/fdc.c7
-rw-r--r--sys/i386/isa/fd.c7
-rw-r--r--sys/isa/atkbdc_isa.c6
-rw-r--r--sys/isa/fd.c7
-rw-r--r--sys/isa/syscons_isa.c6
-rw-r--r--sys/isa/vga_isa.c6
8 files changed, 40 insertions, 11 deletions
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 2ac2525..22a2cbd 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 2ac2525..22a2cbd 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 35cc34c..cc51f93 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));
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index 35cc34c..cc51f93 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.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));
diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 2ac2525..22a2cbd 100644
--- a/sys/isa/atkbdc_isa.c
+++ b/sys/isa/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/isa/fd.c b/sys/isa/fd.c
index 35cc34c..cc51f93 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.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));
diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index 70391e5..85e626e 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_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: syscons_isa.c,v 1.2 1999/04/16 21:22:35 peter Exp $
+ * $Id: syscons_isa.c,v 1.3 1999/05/08 21:59:31 dfr Exp $
*/
#include "sc.h"
@@ -67,6 +67,10 @@ static driver_t sc_driver = {
static int
scprobe(device_t dev)
{
+ /* No pnp support */
+ if (isa_get_vendorid(dev))
+ return (ENXIO);
+
device_set_desc(dev, "System console");
return sc_probe_unit(device_get_unit(dev), isa_get_flags(dev));
}
diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c
index 9f9acde..d95bce7 100644
--- a/sys/isa/vga_isa.c
+++ b/sys/isa/vga_isa.c
@@ -26,7 +26,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: vga_isa.c,v 1.7 1999/05/08 21:59:32 dfr Exp $
+ * $Id: vga_isa.c,v 1.8 1999/05/09 16:39:24 peter Exp $
*/
#include "vga.h"
@@ -114,6 +114,10 @@ isavga_probe(device_t dev)
{
isavga_softc_t *sc;
+ /* No pnp support */
+ if (isa_get_vendorid(dev))
+ return (ENXIO);
+
device_set_desc(dev, "Generic ISA VGA");
sc = device_get_softc(dev);
return isavga_probe_unit(device_get_unit(dev), sc, isa_get_flags(dev));
OpenPOWER on IntegriCloud