Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separate the namespace for default (ie unspecified) locators used 

by the isa.c bus driver and the "address/whatever not specified"
argument passed to leaf device drivers.
The former is "ISACF_XXX_DEFAULT" as generaterd by config(8), the latter
"ISA_UNKNOWN_XXX", defined in isavar.h.
This way we save a dependency of every ISA device driver on "locators.h".
This commit is contained in:
drochner 2004-09-14 20:20:46 +00:00
parent 61ac7027b3
commit 1308c6d767
69 changed files with 363 additions and 367 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/isa/addcom_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: addcom_isa.c,v 1.10 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: addcom_isa.c,v 1.11 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 2000 Michael Graff. All rights reserved.
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.10 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.11 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -136,9 +136,9 @@ addcomprobe(struct device *parent, struct cfdata *self, void *aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
iobase = ia->ia_io[0].ir_addr;

10
sys/dev/isa/adv_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: adv_isa.c,v 1.7 2002/10/02 02:14:45 thorpej Exp $ */
/* $NetBSD: adv_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.7 2002/10/02 02:14:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -136,7 +136,7 @@ adv_isa_probe(parent, match, aux)
* If the I/O address is wildcarded, look for boards
* in ascending order.
*/
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT) {
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT) {
for (port_index = 0; port_index < ASC_IOADR_TABLE_MAX_IX;
port_index++) {
iobase = asc_ioport[port_index];
@ -179,12 +179,12 @@ adv_isa_probe(parent, match, aux)
drq = AscGetIsaDmaChannel(iot, ioh);
/* Verify that the IRQ/DRQ match (or are wildcarded). */
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != irq) {
rv = 0;
goto out;
}
if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT &&
if (ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ &&
ia->ia_drq[0].ir_drq != drq) {
rv = 0;
goto out;

10
sys/dev/isa/aha_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aha_isa.c,v 1.17 2002/10/02 03:10:45 thorpej Exp $ */
/* $NetBSD: aha_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.17 2002/10/02 03:10:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -92,7 +92,7 @@ aha_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, AHA_ISA_IOSIZE, 0, &ioh))
@ -103,10 +103,10 @@ aha_isa_probe(parent, match, aux)
bus_space_unmap(iot, ioh, AHA_ISA_IOSIZE);
if (rv) {
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != apd.sc_irq)
return (0);
if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT &&
if (ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ &&
ia->ia_drq[0].ir_drq != apd.sc_drq)
return (0);

8
sys/dev/isa/aic_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aic_isa.c,v 1.13 2002/10/02 03:10:45 thorpej Exp $ */
/* $NetBSD: aic_isa.c,v 1.14 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.13 2002/10/02 03:10:45 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.14 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -117,11 +117,11 @@ aic_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/* Disallow wildcarded IRQ. */
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, AIC_ISA_IOSIZE, 0, &ioh))

8
sys/dev/isa/ast.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ast.c,v 1.53 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: ast.c,v 1.54 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.53 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.54 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -98,10 +98,10 @@ astprobe(parent, self, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* if the first port is in use as console, then it. */

10
sys/dev/isa/atppc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atppc_isa.c,v 1.5 2004/01/28 13:51:16 drochner Exp $ */
/* $NetBSD: atppc_isa.c,v 1.6 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.5 2004/01/28 13:51:16 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.6 2004/09/14 20:20:46 drochner Exp $");
#include "opt_atppc.h"
@ -107,7 +107,7 @@ atppc_isa_probe(struct device *parent, struct cfdata *cf, void *aux)
return (0);
/* Disallow wildcarded i/o address */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, IO_LPTSIZE, 0, &ioh))
@ -156,7 +156,7 @@ atppc_isa_attach(struct device *parent, struct device *self, void *aux)
/* Assign interrupt handler */
if (!(self->dv_cfdata->cf_flags & ATPPC_FLAG_DISABLE_INTR)
&& ia->ia_irq->ir_irq != ISACF_IRQ_DEFAULT
&& ia->ia_irq->ir_irq != ISA_UNKNOWN_IRQ
&& ia->ia_nirq >= 1) {
sc->sc_irq = ia->ia_irq[0].ir_irq;
} else
@ -172,7 +172,7 @@ atppc_isa_attach(struct device *parent, struct device *self, void *aux)
/* Configure DMA */
if (!(self->dv_cfdata->cf_flags & ATPPC_FLAG_DISABLE_DMA)
&& ia->ia_drq->ir_drq != ISACF_DRQ_DEFAULT
&& ia->ia_drq->ir_drq != ISA_UNKNOWN_DRQ
&& ia->ia_ndrq >= 1)
sc->sc_drq = ia->ia_drq[0].ir_drq;
else

10
sys/dev/isa/bha_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bha_isa.c,v 1.24 2002/10/02 03:10:46 thorpej Exp $ */
/* $NetBSD: bha_isa.c,v 1.25 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.24 2002/10/02 03:10:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.25 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -91,7 +91,7 @@ bha_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, BHA_ISA_IOSIZE, 0, &ioh))
@ -102,10 +102,10 @@ bha_isa_probe(parent, match, aux)
bus_space_unmap(iot, ioh, BHA_ISA_IOSIZE);
if (rv) {
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != bpd.sc_irq)
return (0);
if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT &&
if (ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ &&
ia->ia_drq[0].ir_drq != bpd.sc_drq)
return (0);

8
sys/dev/isa/boca.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: boca.c,v 1.42 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: boca.c,v 1.43 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.42 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.43 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -102,9 +102,9 @@ bocaprobe(parent, self, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
iobase = ia->ia_io[0].ir_addr;

8
sys/dev/isa/cec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cec.c,v 1.1 2003/06/02 03:57:15 gmcgarry Exp $ */
/* $NetBSD: cec.c,v 1.2 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.1 2003/06/02 03:57:15 gmcgarry Exp $");
__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.2 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -161,10 +161,10 @@ cecprobe(struct device *parent, struct cfdata *match, void *aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
ia->ia_ndrq = 0;
if (bus_space_map(iot, ia->ia_io[0].ir_addr, CEC_IOSIZE, 0, &ioh))

6
sys/dev/isa/cms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cms.c,v 1.7 2002/10/02 03:10:46 thorpej Exp $ */
/* $NetBSD: cms.c,v 1.8 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.7 2002/10/02 03:10:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.8 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -143,7 +143,7 @@ cms_probe(parent, match, aux)
if (ISA_DIRECT_CONFIG(ia))
return 0;
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return 0;
if (bus_space_map(iot, ia->ia_io[0].ir_addr, CMS_IOSIZE, 0, &ioh))

8
sys/dev/isa/com_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_isa.c,v 1.21 2003/08/07 16:31:05 agc Exp $ */
/* $NetBSD: com_isa.c,v 1.22 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.21 2003/08/07 16:31:05 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.22 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -126,11 +126,11 @@ com_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/* Don't allow wildcarded IRQ. */
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
iot = ia->ia_iot;

6
sys/dev/isa/cs89x0isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cs89x0isa.c,v 1.8 2004/08/05 16:45:12 drochner Exp $ */
/* $NetBSD: cs89x0isa.c,v 1.9 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright 1997
@ -36,7 +36,7 @@
/* isa DMA routines for cs89x0 */
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.8 2004/08/05 16:45:12 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.9 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,7 +71,7 @@ cs_isa_dma_attach(struct cs_softc *sc)
{
struct cs_softc_isa *isc = (void *)sc;
if (isc->sc_drq == ISACF_DRQ_DEFAULT)
if (isc->sc_drq == ISA_UNKNOWN_DRQ)
printf("%s: DMA channel unspecified, not using DMA\n",
sc->sc_dev.dv_xname);
else if (isc->sc_drq < 5 || isc->sc_drq > 7)

8
sys/dev/isa/cy_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cy_isa.c,v 1.17 2002/10/02 03:10:46 thorpej Exp $ */
/* $NetBSD: cy_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $ */
/*
* cy.c
@ -10,7 +10,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.17 2002/10/02 03:10:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -50,9 +50,9 @@ cy_isa_probe(struct device *parent, struct cfdata *match, void *aux)
sc.sc_bustype = CY_BUSTYPE_ISA;
/* Disallow wildcarded memory address. */
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
return 0;
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return 0;
if (bus_space_map(ia->ia_memt, ia->ia_iomem[0].ir_addr, CY_MEMSIZE, 0,

8
sys/dev/isa/depca_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: depca_isa.c,v 1.7 2003/08/07 16:31:05 agc Exp $ */
/* $NetBSD: depca_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.7 2003/08/07 16:31:05 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -140,7 +140,7 @@ depca_isa_probe(struct device *parent, struct cfdata *match, void *aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* Disallow impossible i/o address. */
@ -151,7 +151,7 @@ depca_isa_probe(struct device *parent, struct cfdata *match, void *aux)
if (bus_space_map(iot, ia->ia_io[0].ir_addr, 16, 0, &ioh))
return 0;
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT ||
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM ||
(ia->ia_iomem[0].ir_size != 32*1024 &&
ia->ia_iomem[0].ir_size != 64*1024))
goto bad;

10
sys/dev/isa/dpt_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dpt_isa.c,v 1.12 2003/12/04 13:57:30 keihan Exp $ */
/* $NetBSD: dpt_isa.c,v 1.13 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.12 2003/12/04 13:57:30 keihan Exp $");
__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.13 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -108,7 +108,7 @@ dpt_isa_match(struct device *parent, struct cfdata *match, void *aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT)
return (dpt_isa_probe(ia, ia->ia_io[0].ir_addr));
for (i = 0; dpt_isa_iobases[i] != 0; i++) {
@ -213,7 +213,7 @@ dpt_isa_probe(struct isa_attach_args *ia, int iobase)
* configuration, use that value. If the HBA told us, use that
* value. Otherwise, puke.
*/
if ((drq = ia->ia_drq[0].ir_drq) == ISACF_DRQ_DEFAULT) {
if ((drq = ia->ia_drq[0].ir_drq) == ISA_UNKNOWN_DRQ) {
int dmanum = ((ec.ec_feat1 & EC_F1_DMA_NUM_MASK) >>
EC_F1_DMA_NUM_SHIFT);
@ -226,7 +226,7 @@ dpt_isa_probe(struct isa_attach_args *ia, int iobase)
* Which IRQ to use: if it was hardwired in the kernel configuration,
* use that value. Otherwise, use what the HBA told us.
*/
if ((irq = ia->ia_irq[0].ir_irq) == ISACF_IRQ_DEFAULT)
if ((irq = ia->ia_irq[0].ir_irq) == ISA_UNKNOWN_IRQ)
irq = ((ec.ec_feat1 & EC_F1_IRQ_NUM_MASK) >>
EC_F1_IRQ_NUM_SHIFT);

12
sys/dev/isa/ega.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ega.c,v 1.16 2004/03/24 17:26:53 drochner Exp $ */
/* $NetBSD: ega.c,v 1.17 2004/09/14 20:20:46 drochner Exp $ */
/*
* Copyright (c) 1999
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.16 2004/03/24 17:26:53 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.17 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -465,17 +465,17 @@ ega_match(parent, match, aux)
return (0);
/* If values are hardwired to something that they can't be, punt. */
if ((ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
if ((ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != 0x3d0 &&
ia->ia_io[0].ir_addr != 0x3b0) ||
/* ia->ia_io[0].ir_size != 0 || XXX isa.c */
(ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
(ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_addr != 0xb8000 &&
ia->ia_iomem[0].ir_addr != 0xb0000) ||
(ia->ia_iomem[0].ir_size != 0 &&
ia->ia_iomem[0].ir_size != 0x8000) ||
ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT ||
ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT)
ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ ||
ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ)
return (0);
if (ega_is_console(ia->ia_iot))

10
sys/dev/isa/esp_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: esp_isa.c,v 1.27 2002/10/02 03:10:46 thorpej Exp $ */
/* $NetBSD: esp_isa.c,v 1.28 2004/09/14 20:20:46 drochner Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -113,7 +113,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.27 2002/10/02 03:10:46 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.28 2004/09/14 20:20:46 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -341,7 +341,7 @@ esp_isa_match(parent, match, aux)
ESP_TRACE(("[esp_isa_match] "));
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return 0;
if (bus_space_map(iot, ia->ia_io[0].ir_addr, ESP_ISA_IOSIZE, 0, &ioh))
@ -352,7 +352,7 @@ esp_isa_match(parent, match, aux)
bus_space_unmap(iot, ioh, ESP_ISA_IOSIZE);
if (rv) {
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != epd.sc_irq) {
#ifdef DIAGNOSTIC
printf("esp_isa_match: configured IRQ (%0d) does not "
@ -398,7 +398,7 @@ esp_isa_attach(parent, self, aux)
return;
}
if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT) {
if (ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ) {
if ((error = isa_dmacascade(ic, ia->ia_drq[0].ir_drq)) != 0) {
printf("%s: unable to cascade DRQ, error = %d\n",
sc->sc_dev.dv_xname, error);

6
sys/dev/isa/ess_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ess_isa.c,v 1.11 2004/08/04 18:53:55 drochner Exp $ */
/* $NetBSD: ess_isa.c,v 1.12 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.11 2004/08/04 18:53:55 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.12 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -115,7 +115,7 @@ ess_isa_probe(parent, match, aux)
ia->ia_nirq = 1;
if (ia->ia_ndrq > 1 &&
ia->ia_drq[1].ir_drq != ISACF_DRQ_DEFAULT)
ia->ia_drq[1].ir_drq != ISA_UNKNOWN_DRQ)
ia->ia_ndrq = 2;
else
ia->ia_ndrq = 1;

10
sys/dev/isa/fdc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fdc_isa.c,v 1.10 2003/09/25 19:06:19 mycroft Exp $ */
/* $NetBSD: fdc_isa.c,v 1.11 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.10 2003/09/25 19:06:19 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.11 2004/09/14 20:20:47 drochner Exp $");
#include "rnd.h"
@ -134,14 +134,14 @@ fdc_isa_probe(struct device *parent,
return (0);
/* Disallow wildcarded I/O addresses. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/* Don't allow wildcarded IRQ/DRQ. */
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if (ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
if (ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
return (0);
/* Map the I/O space. */

28
sys/dev/isa/gus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: gus.c,v 1.83 2004/04/22 00:17:12 itojun Exp $ */
/* $NetBSD: gus.c,v 1.84 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.83 2004/04/22 00:17:12 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.84 2004/09/14 20:20:47 drochner Exp $");
#include "gus.h"
#if NGUS > 0
@ -451,13 +451,11 @@ CFATTACH_DECL(gus, sizeof(struct gus_softc),
*/
static const int gus_irq_map[] = {
ISACF_IRQ_DEFAULT, ISACF_IRQ_DEFAULT, 1, 3, ISACF_IRQ_DEFAULT, 2,
ISACF_IRQ_DEFAULT, 4, ISACF_IRQ_DEFAULT, 1, ISACF_IRQ_DEFAULT, 5,
6, ISACF_IRQ_DEFAULT, ISACF_IRQ_DEFAULT, 7
-1, -1, 1, 3, -1, 2, -1, 4,
-1, 1, -1, 5, 6, -1, -1, 7
};
static const int gus_drq_map[] = {
ISACF_DRQ_DEFAULT, 1, ISACF_DRQ_DEFAULT, 2, ISACF_DRQ_DEFAULT, 3,
4, 5
-1, 1, -1, 2, -1, 3, 4, 5
};
/*
@ -695,7 +693,7 @@ gusprobe(parent, match, aux)
if (ia->ia_ndrq > 1)
recdrq = ia->ia_drq[1].ir_drq;
else
recdrq = ISACF_DRQ_DEFAULT;
recdrq = ISA_UNKNOWN_DRQ;
/*
* Before we do anything else, make sure requested IRQ and DRQ are
@ -703,22 +701,22 @@ gusprobe(parent, match, aux)
*/
/* XXX range check before indexing!! */
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT ||
gus_irq_map[ia->ia_irq[0].ir_irq] == ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ ||
gus_irq_map[ia->ia_irq[0].ir_irq] == -1) {
printf("gus: invalid irq %d, card not probed\n",
ia->ia_irq[0].ir_irq);
return 0;
}
if (ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT ||
gus_drq_map[ia->ia_drq[0].ir_drq] == ISACF_DRQ_DEFAULT) {
if (ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ ||
gus_drq_map[ia->ia_drq[0].ir_drq] == -1) {
printf("gus: invalid drq %d, card not probed\n",
ia->ia_drq[0].ir_drq);
return 0;
}
if (recdrq != ISACF_DRQ_DEFAULT) {
if (recdrq > 7 || gus_drq_map[recdrq] == ISACF_DRQ_DEFAULT) {
if (recdrq != ISA_UNKNOWN_DRQ) {
if (recdrq > 7 || gus_drq_map[recdrq] == -1) {
printf("gus: invalid second DMA channel (%d), card not "
"probed\n", recdrq);
return 0;
@ -726,7 +724,7 @@ gusprobe(parent, match, aux)
} else
recdrq = ia->ia_drq[0].ir_drq;
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
int i;
for(i = 0; i < gus_addrs; i++)
if (gus_test_iobase(ia->ia_iot, gus_base_addrs[i])) {

12
sys/dev/isa/i82365_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isa.c,v 1.21 2004/08/11 00:18:19 mycroft Exp $ */
/* $NetBSD: i82365_isa.c,v 1.22 2004/09/14 20:20:47 drochner Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.21 2004/08/11 00:18:19 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.22 2004/09/14 20:20:47 drochner Exp $");
#define PCICISADEBUG
@ -106,15 +106,15 @@ pcic_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, PCIC_IOSIZE, 0, &ioh))
return (0);
if (ia->ia_iomem[0].ir_size == ISACF_IOSIZ_DEFAULT)
if (ia->ia_iomem[0].ir_size == ISA_UNKNOWN_IOSIZ)
msize = PCIC_MEMSIZE;
else
msize = ia->ia_iomem[0].ir_size;
@ -224,7 +224,7 @@ pcic_isa_attach(parent, self, aux)
if (ia->ia_nirq > 0)
sc->irq = ia->ia_irq[0].ir_irq;
else
sc->irq = ISACF_IRQ_DEFAULT;
sc->irq = ISA_UNKNOWN_IRQ;
printf("\n");

18
sys/dev/isa/i82365_isasubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365_isasubr.c,v 1.33 2003/09/05 01:02:52 mycroft Exp $ */
/* $NetBSD: i82365_isasubr.c,v 1.34 2004/09/14 20:20:47 drochner Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.33 2003/09/05 01:02:52 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.34 2004/09/14 20:20:47 drochner Exp $");
#define PCICISADEBUG
@ -328,7 +328,7 @@ pcic_isa_config_interrupts(self)
* scarce, shareable, and for PCIC controllers, very infrequent.
*/
if ((self->dv_cfdata->cf_flags & 1) == 0) {
if (sc->irq != ISACF_IRQ_DEFAULT) {
if (sc->irq != ISA_UNKNOWN_IRQ) {
if ((chipmask & (1 << sc->irq)) == 0)
printf("%s: warning: configured irq %d not "
"detected as available\n",
@ -336,27 +336,27 @@ pcic_isa_config_interrupts(self)
} else if (chipmask == 0 ||
isa_intr_alloc(ic, chipmask, IST_EDGE, &sc->irq)) {
printf("%s: no available irq; ", sc->dev.dv_xname);
sc->irq = ISACF_IRQ_DEFAULT;
sc->irq = ISA_UNKNOWN_IRQ;
} else if ((chipmask & ~(1 << sc->irq)) == 0 && chipuniq == 0) {
printf("%s: can't share irq with cards; ",
sc->dev.dv_xname);
sc->irq = ISACF_IRQ_DEFAULT;
sc->irq = ISA_UNKNOWN_IRQ;
}
} else {
printf("%s: ", sc->dev.dv_xname);
sc->irq = ISACF_IRQ_DEFAULT;
sc->irq = ISA_UNKNOWN_IRQ;
}
if (sc->irq != ISACF_IRQ_DEFAULT) {
if (sc->irq != ISA_UNKNOWN_IRQ) {
sc->ih = isa_intr_establish(ic, sc->irq, IST_EDGE, IPL_TTY,
pcic_intr, sc);
if (sc->ih == NULL) {
printf("%s: can't establish interrupt",
sc->dev.dv_xname);
sc->irq = ISACF_IRQ_DEFAULT;
sc->irq = ISA_UNKNOWN_IRQ;
}
}
if (sc->irq == ISACF_IRQ_DEFAULT)
if (sc->irq == ISA_UNKNOWN_IRQ)
printf("polling for socket events\n");
else
printf("%s: using irq %d for socket events\n", sc->dev.dv_xname,

10
sys/dev/isa/if_ai.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ai.c,v 1.18 2004/04/22 00:17:12 itojun Exp $ */
/* $NetBSD: if_ai.c,v 1.19 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.18 2004/04/22 00:17:12 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.19 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -256,9 +256,9 @@ ai_match(parent, cf, aux)
return (0);
/* Punt if wildcarded port, IRQ or memory address */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT ||
ia->ia_iomem[0].ir_addr == ISACF_IRQ_DEFAULT ||
ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT ||
ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM ||
ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
DPRINTF((
"ai_match: wildcarded IRQ, IOAddr, or memAddr, skipping\n"));
return (0);

8
sys/dev/isa/if_ate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ate.c,v 1.39 2002/11/30 14:15:11 tsutsui Exp $ */
/* $NetBSD: if_ate.c,v 1.40 2004/09/14 20:20:47 drochner Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.39 2002/11/30 14:15:11 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.40 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -112,7 +112,7 @@ ate_match(parent, match, aux)
return (0);
/* Disallow wildcarded values. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/*
@ -159,7 +159,7 @@ ate_match(parent, match, aux)
goto out;
}
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ) {
if (ia->ia_irq[0].ir_irq != irq) {
printf("ate_match: irq mismatch; "
"kernel configured %d != board configured %d\n",

22
sys/dev/isa/if_cs_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_cs_isa.c,v 1.12 2003/10/29 01:10:12 mycroft Exp $ */
/* $NetBSD: if_cs_isa.c,v 1.13 2004/09/14 20:20:47 drochner Exp $ */
/*
* Copyright 1997
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.12 2003/10/29 01:10:12 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.13 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,13 +93,13 @@ cs_isa_probe(parent, cf, aux)
/*
* Disallow wildcarded I/O base.
*/
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_niomem > 0)
maddr = ia->ia_iomem[0].ir_addr;
else
maddr = ISACF_IOMEM_DEFAULT;
maddr = ISA_UNKNOWN_IOMEM;
/*
* Map the I/O space.
@ -137,8 +137,8 @@ cs_isa_probe(parent, cf, aux)
* If the IRQ or memory address were not specified, read the
* ISA_CFG EEPROM location.
*/
if (maddr == ISACF_IOMEM_DEFAULT ||
ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (maddr == ISA_UNKNOWN_IOMEM ||
ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
if (cs_verify_eeprom(&sc) == CS_ERROR) {
printf("cs_isa_probe: EEPROM bad or missing\n");
goto out;
@ -153,7 +153,7 @@ cs_isa_probe(parent, cf, aux)
/*
* If the IRQ wasn't specified, get it from the EEPROM.
*/
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
irq = isa_cfg & ISA_CFG_IRQ_MASK;
if (irq == 3)
irq = 5;
@ -165,7 +165,7 @@ cs_isa_probe(parent, cf, aux)
/*
* If the memory address wasn't specified, get it from the EEPROM.
*/
if (maddr == ISACF_IOMEM_DEFAULT) {
if (maddr == ISA_UNKNOWN_IOMEM) {
if ((isa_cfg & ISA_CFG_MEM_MODE) == 0) {
/* EEPROM says don't use memory mode. */
goto out;
@ -186,14 +186,14 @@ cs_isa_probe(parent, cf, aux)
if (bus_space_map(ia->ia_memt, maddr, CS8900_MEMSIZE, 0, &memh)) {
/* Can't map it; fall back on i/o-only mode. */
printf("cs_isa_probe: unable to map memory space\n");
maddr = ISACF_IOMEM_DEFAULT;
maddr = ISA_UNKNOWN_IOMEM;
} else
have_mem = 1;
ia->ia_nio = 1;
ia->ia_io[0].ir_size = CS8900_IOSIZE;
if (maddr == ISACF_IOMEM_DEFAULT)
if (maddr == ISA_UNKNOWN_IOMEM)
ia->ia_niomem = 0;
else {
ia->ia_niomem = 1;
@ -259,7 +259,7 @@ cs_isa_attach(parent, self, aux)
* we set ourselves up to use memory mode forever. Otherwise,
* we fall back on I/O mode.
*/
if (ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
if (ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_size == CS8900_MEMSIZE &&
CS8900_MEMBASE_ISVALID(ia->ia_iomem[0].ir_addr)) {
if (bus_space_map(sc->sc_memt, ia->ia_iomem[0].ir_addr,

16
sys/dev/isa/if_ec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ec.c,v 1.21 2004/05/11 22:45:09 wiz Exp $ */
/* $NetBSD: if_ec.c,v 1.22 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.21 2004/05/11 22:45:09 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.22 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -121,8 +121,8 @@ static const int ec_iobase[] = {
#define NEC_IOBASE (sizeof(ec_iobase) / sizeof(ec_iobase[0]))
static const int ec_membase[] = {
ISACF_IOMEM_DEFAULT, ISACF_IOMEM_DEFAULT, ISACF_IOMEM_DEFAULT,
ISACF_IOMEM_DEFAULT, 0xc8000, 0xcc000, 0xd8000, 0xdc000,
-1, -1, -1, -1,
0xc8000, 0xcc000, 0xd8000, 0xdc000,
};
#define NEC_MEMBASE (sizeof(ec_membase) / sizeof(ec_membase[0]))
@ -162,11 +162,11 @@ ec_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o addresses. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/* Disallow wildcarded mem address. */
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
return (0);
/* Validate the i/o base. */
@ -178,7 +178,7 @@ ec_probe(parent, match, aux)
/* Validate the mem base. */
for (i = 0; i < NEC_MEMBASE; i++) {
if (ec_membase[i] == ISACF_IOMEM_DEFAULT)
if (ec_membase[i] == -1)
continue;
if (ia->ia_iomem[0].ir_addr == ec_membase[i])
break;
@ -466,7 +466,7 @@ ec_attach(parent, self, aux)
case 5: tmp = ELINK2_IDCFR_IRQ5; break;
break;
case ISACF_IRQ_DEFAULT:
case ISA_UNKNOWN_IRQ:
printf("%s: wildcarded IRQ is not allowed\n",
sc->sc_dev.dv_xname);
return;

10
sys/dev/isa/if_ef.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ef.c,v 1.16 2004/04/22 00:17:12 itojun Exp $ */
/* $NetBSD: if_ef.c,v 1.17 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.16 2004/04/22 00:17:12 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.17 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -467,15 +467,15 @@ ef_match(parent, cf, aux)
if (bus->isa_cards[idx].available != 1)
continue;
if (ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
if (ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != bus->isa_cards[idx].iobase)
continue;
if (ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
if (ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_addr != bus->isa_cards[idx].maddr)
continue;
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != bus->isa_cards[idx].irq)
continue;

8
sys/dev/isa/if_eg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eg.c,v 1.62 2003/10/30 01:58:17 simonb Exp $ */
/* $NetBSD: if_eg.c,v 1.63 2004/09/14 20:20:47 drochner Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.62 2003/10/30 01:58:17 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.63 2004/09/14 20:20:47 drochner Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@ -342,11 +342,11 @@ egprobe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/* Disallow wildcarded IRQ. */
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if ((ia->ia_io[0].ir_addr & ~0x07f0) != 0) {

8
sys/dev/isa/if_el.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_el.c,v 1.70 2003/01/15 22:01:16 bouyer Exp $ */
/* $NetBSD: if_el.c,v 1.71 2004/09/14 20:20:47 drochner Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.70 2003/01/15 22:01:16 bouyer Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.71 2004/09/14 20:20:47 drochner Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@ -145,9 +145,9 @@ elprobe(parent, match, aux)
iobase = ia->ia_io[0].ir_addr;
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* First check the base. */

8
sys/dev/isa/if_ep_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ep_isa.c,v 1.33 2002/10/02 03:10:47 thorpej Exp $ */
/* $NetBSD: if_ep_isa.c,v 1.34 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.33 2002/10/02 03:10:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.34 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -332,11 +332,11 @@ bus_probed:
if (epcards[i].available == 0)
continue;
if (ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
if (ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != epcards[i].iobase)
continue;
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != epcards[i].irq)
continue;

8
sys/dev/isa/if_fmv_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fmv_isa.c,v 1.2 2002/10/05 17:52:32 tsutsui Exp $ */
/* $NetBSD: if_fmv_isa.c,v 1.3 2004/09/14 20:20:47 drochner Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.2 2002/10/05 17:52:32 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.3 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -109,7 +109,7 @@ fmv_isa_match(parent, match, aux)
return (0);
/* Disallow wildcarded values. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/*
@ -157,7 +157,7 @@ fmv_isa_match(parent, match, aux)
goto out;
}
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ) {
if (ia->ia_irq[0].ir_irq != irq) {
printf("fmv_match: irq mismatch; "
"kernel configured %d != board configured %d\n",

14
sys/dev/isa/if_ix.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ix.c,v 1.18 2004/07/08 21:01:49 mycroft Exp $ */
/* $NetBSD: if_ix.c,v 1.19 2004/09/14 20:20:47 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.18 2004/07/08 21:01:49 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.19 2004/09/14 20:20:47 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -543,7 +543,7 @@ ix_match(parent, cf, aux)
iot = ia->ia_iot;
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr,
@ -624,7 +624,7 @@ ix_match(parent, cf, aux)
goto out;
}
if (ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
if (ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_addr != maddr) {
DPRINTF((
"ix_match: memaddr of board @ 0x%x doesn't match config\n",
@ -632,7 +632,7 @@ ix_match(parent, cf, aux)
goto out;
}
if (ia->ia_iomem[0].ir_size != ISACF_IOSIZ_DEFAULT &&
if (ia->ia_iomem[0].ir_size != ISA_UNKNOWN_IOSIZ &&
ia->ia_iomem[0].ir_size != msize) {
DPRINTF((
"ix_match: memsize of board @ 0x%x doesn't match config\n",
@ -676,13 +676,13 @@ ix_match(parent, cf, aux)
/*
* Get the encoded interrupt number from the EEPROM, check it
* against the passed in IRQ. Issue a warning if they do not
* match, and fail the probe. If irq is 'ISACF_IRQ_DEFAULT' then we
* match, and fail the probe. If irq is 'ISA_UNKNOWN_IRQ' then we
* use the EEPROM irq, and continue.
*/
irq_encoded = ix_read_eeprom(iot, ioh, IX_EEPROM_CONFIG1);
irq_encoded = (irq_encoded & IX_EEPROM_IRQ) >> IX_EEPROM_IRQ_SHIFT;
irq = irq_translate[irq_encoded];
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
irq != ia->ia_irq[0].ir_irq) {
DPRINTF(("board IRQ %d does not match config\n", irq));
goto out;

8
sys/dev/isa/if_iy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iy.c,v 1.63 2003/10/30 01:58:17 simonb Exp $ */
/* $NetBSD: if_iy.c,v 1.64 2004/09/14 20:20:47 drochner Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.63 2003/10/30 01:58:17 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.64 2004/09/14 20:20:47 drochner Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@ -220,7 +220,7 @@ iyprobe(parent, match, aux)
iot = ia->ia_iot;
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return 0;
if (bus_space_map(iot, ia->ia_io[0].ir_addr, 16, 0, &ioh))
@ -267,7 +267,7 @@ iyprobe(parent, match, aux)
if (eepromreadall(iot, ioh, eaddr, 8))
goto out;
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
irq = eepro_irqmap[eaddr[EEPPW1] & EEPP_Int];
else
irq = ia->ia_irq[0].ir_irq;

10
sys/dev/isa/if_lc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_lc_isa.c,v 1.18 2004/07/03 21:29:08 mycroft Exp $ */
/* $NetBSD: if_lc_isa.c,v 1.19 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.18 2004/07/03 21:29:08 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.19 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,7 +93,7 @@ lemac_isa_find(sc, ia, attach)
/*
* Disallow wildcarded i/o addresses.
*/
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return 0;
/*
@ -124,7 +124,7 @@ lemac_isa_find(sc, ia, attach)
*/
lemac_info_get(sc->sc_iot, sc->sc_ioh, &maddr, &msize, &irq);
if (ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
if (ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_addr != maddr)
goto outio;
@ -144,7 +144,7 @@ lemac_isa_find(sc, ia, attach)
/*
* Double-check IRQ configuration.
*/
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != irq)
printf("%s: overriding IRQ %d to %d\n", sc->sc_dv.dv_xname,
ia->ia_irq[0].ir_irq, irq);

12
sys/dev/isa/if_le_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_isa.c,v 1.35 2003/08/07 16:31:07 agc Exp $ */
/* $NetBSD: if_le_isa.c,v 1.36 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.35 2003/08/07 16:31:07 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.36 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -230,12 +230,12 @@ lance_isa_probe(ia, p, flags)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if ((flags & LANCEISA_FLAG_LOCALBUS) == 0 &&
ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
return (0);
/* Map i/o space. */
@ -263,7 +263,7 @@ lance_isa_probe(ia, p, flags)
ia->ia_nirq = 1;
if ((flags & LANCEISA_FLAG_LOCALBUS) != 0 &&
ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
ia->ia_ndrq = 0;
else
ia->ia_ndrq = 1;

8
sys/dev/isa/if_ne_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ne_isa.c,v 1.17 2004/02/13 10:05:50 wiz Exp $ */
/* $NetBSD: if_ne_isa.c,v 1.18 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.17 2004/02/13 10:05:50 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.18 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -104,9 +104,9 @@ ne_isa_match(parent, match, aux)
return (0);
/* Disallow wildcarded values. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* Make sure this is a valid NE[12]000 i/o address. */

12
sys/dev/isa/if_ntwoc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ntwoc_isa.c,v 1.7 2003/05/03 18:11:27 wiz Exp $ */
/* $NetBSD: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ntwoc_isa.c,v 1.7 2003/05/03 18:11:27 wiz Exp $
* $Id: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Exp $
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.7 2003/05/03 18:11:27 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.8 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -214,17 +214,17 @@ ntwoc_isa_probe(struct device *parent, struct cfdata *match, void *aux)
dbg = 0;
/* disallow wildcarded I/O base */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT) {
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT) {
printf("ntwoc_isa_probe: must specify port address\n");
return (0);
}
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
printf("ntwoc_isa_probe: must specify irq\n");
return (0);
}
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT) {
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM) {
printf("ntwoc_isa_probe: must specify iomem\n");
return (0);
}

8
sys/dev/isa/if_sm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sm_isa.c,v 1.12 2002/10/02 03:10:48 thorpej Exp $ */
/* $NetBSD: if_sm_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.12 2002/10/02 03:10:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -101,9 +101,9 @@ sm_isa_match(parent, match, aux)
return (0);
/* Disallow wildcarded values. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* Map i/o space. */

12
sys/dev/isa/if_tribm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_tribm_isa.c,v 1.4 2002/01/07 21:47:09 thorpej Exp $ */
/* $NetBSD: if_tribm_isa.c,v 1.5 2004/09/14 20:20:48 drochner Exp $ */
/* XXXJRT changes isa_attach_args too early */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.4 2002/01/07 21:47:09 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.5 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,7 +93,7 @@ tribm_isa_probe(parent, match, aux)
if (ia->ia_iobase == IOBASEUNK)
ia->ia_iobase = 0xa20;
#else
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
#endif
@ -125,7 +125,7 @@ tribm_isa_probe(parent, match, aux)
case 0xF:
case 0xE:
case 0xD:
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
#ifdef notyet
ia->ia_maddr = TR_SRAM_DEFAULT;
#else
@ -134,7 +134,7 @@ tribm_isa_probe(parent, match, aux)
break;
case 0xC:
i = bus_space_read_1(memt, mmioh, TR_ACA_OFFSET) << 12;
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
ia->ia_iomem[0].ir_addr = i;
else if (ia->ia_iomem[0].ir_addr != i) {
printf(
@ -167,7 +167,7 @@ tribm_isa_probe(parent, match, aux)
return 0;
}
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
ia->ia_irq[0].ir_irq = irq;
else if (ia->ia_irq[0].ir_irq != irq) {
printf(

8
sys/dev/isa/if_trtcm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_trtcm_isa.c,v 1.5 2002/01/07 21:47:09 thorpej Exp $ */
/* $NetBSD: if_trtcm_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $ */
/* XXXJRT verify doens't change isa_attach_args too early */
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.5 2002/01/07 21:47:09 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $");
#undef TRTCMISADEBUG
@ -346,10 +346,10 @@ bus_probed:
continue;
if (tcmcards[i].available == 0)
continue;
if (ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
if (ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != tcmcards[i].iobase)
continue;
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != tcmcards[i].irq)
continue;
goto good;

16
sys/dev/isa/if_we_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_we_isa.c,v 1.8 2002/10/02 03:10:48 thorpej Exp $ */
/* $NetBSD: if_we_isa.c,v 1.9 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.8 2002/10/02 03:10:48 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.9 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -107,7 +107,7 @@ static const int we_584_irq[] = {
#define NWE_584_IRQ (sizeof(we_584_irq) / sizeof(we_584_irq[0]))
static const int we_790_irq[] = {
ISACF_IRQ_DEFAULT, 9, 3, 5, 7, 10, 11, 15,
ISA_UNKNOWN_IRQ, 9, 3, 5, 7, 10, 11, 15,
};
#define NWE_790_IRQ (sizeof(we_790_irq) / sizeof(we_790_irq[0]))
@ -172,11 +172,11 @@ we_isa_probe(parent, cf, aux)
return (0);
/* Disallow wildcarded i/o addresses. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
/* Disallow wildcarded mem address. */
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
return (0);
/* Attempt to map the device. */
@ -258,7 +258,7 @@ we_isa_probe(parent, cf, aux)
bus_space_write_1(asict, asich, WE790_HWR,
hwr & ~WE790_HWR_SWH);
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != we_790_irq[i])
printf("%s%d: overriding configured IRQ %d to %d\n",
we_cd.cd_name, cf->cf_unit, ia->ia_irq[0].ir_irq,
@ -270,7 +270,7 @@ we_isa_probe(parent, cf, aux)
((bus_space_read_1(asict, asich, WE_IRR) &
(WE_IRR_IR0 | WE_IRR_IR1)) >> 5);
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != we_584_irq[i])
printf("%s%d: overriding configured IRQ %d to %d\n",
we_cd.cd_name, cf->cf_unit, ia->ia_irq[0].ir_irq,
@ -376,7 +376,7 @@ we_isa_attach(parent, self, aux)
else if (wsc->sc_type & WE_SOFTCONFIG)
bus_space_write_1(asict, asich, WE_IRR,
bus_space_read_1(asict, asich, WE_IRR) | WE_IRR_IEN);
else if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
else if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
printf("%s: can't wildcard IRQ on a %s\n",
sc->sc_dev.dv_xname, typestr);
return;

6
sys/dev/isa/ioat66.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ioat66.c,v 1.8 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: ioat66.c,v 1.9 2004/09/14 20:20:48 drochner Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.8 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.9 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -95,7 +95,7 @@ ioat66probe(parent, self, aux)
*/
/* Disallow wildcarded i/o address. */
if (ia->ia_iobase == ISACF_PORT_DEFAULT)
if (ia->ia_iobase == ISA_UNKNOWN_PORT)
return (0);
/* if the first port is in use as console, then it. */

22
sys/dev/isa/isavar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isavar.h,v 1.43 2004/08/30 15:05:19 drochner Exp $ */
/* $NetBSD: isavar.h,v 1.44 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
@ -211,8 +211,6 @@ struct isa_attach_args {
#define ISA_DIRECT_CONFIG(ia) \
((ia)->ia_pnpname != NULL || (ia)->ia_pnpcompatnames != NULL)
#include "locators.h"
/*
* ISA master bus
*/
@ -229,13 +227,17 @@ struct isa_softc {
int sc_dynamicdevs;
};
#define cf_iobase cf_loc[ISACF_PORT]
#define cf_iosize cf_loc[ISACF_SIZE]
#define cf_maddr cf_loc[ISACF_IOMEM]
#define cf_msize cf_loc[ISACF_IOSIZ]
#define cf_irq cf_loc[ISACF_IRQ]
#define cf_drq cf_loc[ISACF_DRQ]
#define cf_drq2 cf_loc[ISACF_DRQ2]
/*
* These must be in sync with the ISACF_XXX_DEFAULT definitions
* in "locators.h" (generated from files.isa).
* (not including "locators.h" here to avoid dependency)
*/
#define ISA_UNKNOWN_PORT (-1)
#define ISA_UNKNOWN_IOMEM (-1)
#define ISA_UNKNOWN_IOSIZ (0)
#define ISA_UNKNOWN_IRQ (-1)
#define ISA_UNKNOWN_DRQ (-1)
#define ISA_UNKNOWN_DRQ2 (-1)
int isabusprint(void *, const char *);

30
sys/dev/isa/isic_isa.c
View File

@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.19 2003/12/04 13:57:30 keihan Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.20 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@ -146,7 +146,7 @@ isic_isa_probe(parent, cf, aux)
return (0);
/* check irq */
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
printf("isic%d: config error: no IRQ specified\n", cf->cf_unit);
return 0;
}
@ -232,7 +232,7 @@ isic_isa_probe(parent, cf, aux)
default:
/* No card type given, try to figure ... */
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
ret = 0;
#ifdef ISICISA_TEL_S0_8
/* only Teles S0/8 will work without IO */
@ -244,7 +244,7 @@ isic_isa_probe(parent, cf, aux)
ret = isic_probe_s08(&args);
}
#endif /* ISICISA_TEL_S0_8 */
} else if (maddr == ISACF_IOMEM_DEFAULT) {
} else if (maddr == ISA_UNKNOWN_IOMEM) {
ret = 0;
#ifdef ISICISA_TEL_S0_16_3
/* no shared memory, only a 16.3 based card,
@ -819,14 +819,14 @@ isic_isa_attach(parent, self, aux)
iobase = ia->ia_io[0].ir_addr;
iosize = ia->ia_io[0].ir_size;
} else {
iobase = ISACF_PORT_DEFAULT;
iobase = ISA_UNKNOWN_PORT;
iosize = 0;
}
if (ia->ia_niomem > 0) {
maddr = ia->ia_iomem[0].ir_addr;
msize = ia->ia_iomem[0].ir_size;
} else {
maddr = ISACF_IOMEM_DEFAULT;
maddr = ISA_UNKNOWN_IOMEM;
msize = 0;
}
@ -857,7 +857,7 @@ isic_isa_attach(parent, self, aux)
args.ia_flags = flags;
/* Probe cards */
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
ret = 0;
#ifdef ISICISA_TEL_S0_8
/* only Teles S0/8 will work without IO */
@ -869,7 +869,7 @@ isic_isa_attach(parent, self, aux)
goto found;
args_unmap(&args.ia_num_mappings, &args.ia_maps[0]);
#endif /* ISICISA_TEL_S0_8 */
} else if (maddr == ISACF_IOMEM_DEFAULT) {
} else if (maddr == ISA_UNKNOWN_IOMEM) {
/* no shared memory, only a 16.3 based card,
AVM A1, the usr sportster or an ITK would work */
ret = 0;
@ -1025,7 +1025,7 @@ setup_io_map(flags, iot, memt, iobase, maddr, num_mappings, maps, iosize, msize)
switch(flags)
{
case FLAG_TELES_S0_8:
if (maddr == ISACF_IOMEM_DEFAULT) {
if (maddr == ISA_UNKNOWN_IOMEM) {
printf("isic: config error: no shared memory specified for Teles S0/8!\n");
return 1;
}
@ -1049,11 +1049,11 @@ setup_io_map(flags, iot, memt, iobase, maddr, num_mappings, maps, iosize, msize)
break;
case FLAG_TELES_S0_16:
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
printf("isic: config error: no i/o address specified for Teles S0/16!\n");
return 1;
}
if (maddr == ISACF_IOMEM_DEFAULT) {
if (maddr == ISA_UNKNOWN_IOMEM) {
printf("isic: config error: no shared memory specified for Teles S0/16!\n");
return 1;
}
@ -1085,7 +1085,7 @@ setup_io_map(flags, iot, memt, iobase, maddr, num_mappings, maps, iosize, msize)
break;
case FLAG_TELES_S0_163:
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
printf("isic: config error: no i/o address specified for Teles S0/16!\n");
return 1;
}
@ -1139,7 +1139,7 @@ setup_io_map(flags, iot, memt, iobase, maddr, num_mappings, maps, iosize, msize)
break;
case FLAG_AVM_A1:
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
printf("isic: config error: no i/o address specified for AVM A1/Fritz! card!\n");
return 1;
}
@ -1212,7 +1212,7 @@ setup_io_map(flags, iot, memt, iobase, maddr, num_mappings, maps, iosize, msize)
break;
case FLAG_USR_ISDN_TA_INT:
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
printf("isic: config error: no I/O base specified for USR Sportster TA intern!\n");
return 1;
}
@ -1284,7 +1284,7 @@ setup_io_map(flags, iot, memt, iobase, maddr, num_mappings, maps, iosize, msize)
break;
case FLAG_ITK_IX1:
if (iobase == ISACF_PORT_DEFAULT) {
if (iobase == ISA_UNKNOWN_PORT) {
printf("isic: config error: no I/O base specified for ITK ix1 micro!\n");
return 1;
}

6
sys/dev/isa/joy_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: joy_isa.c,v 1.5 2003/12/04 12:42:54 keihan Exp $ */
/* $NetBSD: joy_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.5 2003/12/04 12:42:54 keihan Exp $");
__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.6 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -68,7 +68,7 @@ joy_isa_probe(parent, match, aux)
if (ia->ia_nio < 1)
return (0);
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, JOY_NPORTS, 0, &ioh))

6
sys/dev/isa/lm_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lm_isa.c,v 1.9 2002/11/15 14:55:44 ad Exp $ */
/* $NetBSD: lm_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.9 2002/11/15 14:55:44 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -95,7 +95,7 @@ lm_isa_match(parent, match, aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
iot = ia->ia_iot;

8
sys/dev/isa/lpt_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt_isa.c,v 1.57 2003/04/03 15:35:41 christos Exp $ */
/* $NetBSD: lpt_isa.c,v 1.58 2004/09/14 20:20:48 drochner Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.57 2003/04/03 15:35:41 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.58 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -173,7 +173,7 @@ lpt_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
iot = ia->ia_iot;
@ -231,7 +231,7 @@ lpt_isa_attach(parent, self, aux)
bus_space_handle_t ioh;
if (ia->ia_nirq < 1 ||
ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
sc->sc_irq = -1;
printf(": polled\n");
} else {

8
sys/dev/isa/mcd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcd.c,v 1.85 2003/11/07 04:10:57 mycroft Exp $ */
/* $NetBSD: mcd.c,v 1.86 2004/09/14 20:20:48 drochner Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.85 2003/11/07 04:10:57 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.86 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -935,9 +935,9 @@ mcdprobe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* Map i/o space */

8
sys/dev/isa/moxa_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: moxa_isa.c,v 1.9 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: moxa_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.9 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -98,9 +98,9 @@ moxa_isaprobe(parent, self, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* if the first port is in use as console, then it. */

8
sys/dev/isa/mpu_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mpu_isa.c,v 1.9 2002/10/02 03:10:49 thorpej Exp $ */
/* $NetBSD: mpu_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.9 2002/10/02 03:10:49 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -84,9 +84,9 @@ mpu_isa_match(parent, match, aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
memset(&sc, 0, sizeof sc);

8
sys/dev/isa/nca_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nca_isa.c,v 1.12 2002/10/02 03:10:49 thorpej Exp $ */
/* $NetBSD: nca_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.12 2002/10/02 03:10:49 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.13 2004/09/14 20:20:48 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -268,7 +268,7 @@ nca_isa_match(parent, match, aux)
return (0);
/* See if we are looking for a port- or memory-mapped adapter */
if (ia->ia_nio > 0 || ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT) {
if (ia->ia_nio > 0 || ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT) {
/* Port-mapped card */
if (bus_space_map(iot, ia->ia_io[0].ir_addr, NCA_ISA_IOSIZE,
0, &ioh))
@ -398,7 +398,7 @@ nca_isa_attach(parent, self, aux)
sc->sc_intr_on = NULL;
sc->sc_intr_off = NULL;
if (ia->ia_nirq > 0 && ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT) {
if (ia->ia_nirq > 0 && ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ) {
esc->sc_ih = isa_intr_establish(ic, ia->ia_irq[0].ir_irq,
IST_EDGE, IPL_BIO, ncr5380_intr, esc);
if (esc->sc_ih == NULL) {

6
sys/dev/isa/nsclpcsio_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */
/* $NetBSD: nsclpcsio_isa.c,v 1.6 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 2002
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.6 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -121,7 +121,7 @@ nsclpcsio_isa_match(parent, match, aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_nio > 0 && ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT) {
if (ia->ia_nio > 0 && ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT) {
/* XXX check for legal iobase ??? */
if (nscheck(ia->ia_iot, ia->ia_io[0].ir_addr)) {
iobase = ia->ia_io[0].ir_addr;

6
sys/dev/isa/opl_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: opl_isa.c,v 1.9 2002/10/02 03:10:49 thorpej Exp $ */
/* $NetBSD: opl_isa.c,v 1.10 2004/09/14 20:20:49 drochner Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.9 2002/10/02 03:10:49 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.10 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -85,7 +85,7 @@ opl_isa_match(parent, match, aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
memset(&sc, 0, sizeof sc);

6
sys/dev/isa/pas.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pas.c,v 1.58 2004/04/22 00:17:12 itojun Exp $ */
/* $NetBSD: pas.c,v 1.59 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@ -57,7 +57,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.58 2004/04/22 00:17:12 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.59 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -382,7 +382,7 @@ pasfind(parent, sc, ia, probing)
}
if (sc->model >= 0) {
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
printf("pas: sb emulation requires known irq\n");
goto unmap1;
}

12
sys/dev/isa/pcdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcdisplay.c,v 1.25 2004/03/24 17:26:53 drochner Exp $ */
/* $NetBSD: pcdisplay.c,v 1.26 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1998
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.25 2004/03/24 17:26:53 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.26 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -233,13 +233,13 @@ pcdisplay_match(parent, match, aux)
/* If values are hardwired to something that they can't be, punt. */
if (ia->ia_nio < 1 ||
(ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
(ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != 0x3d0 &&
ia->ia_io[0].ir_addr != 0x3b0))
return (0);
if (ia->ia_niomem < 1 ||
(ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
(ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_addr != 0xb8000 &&
ia->ia_iomem[0].ir_addr != 0xb0000))
return (0);
@ -248,11 +248,11 @@ pcdisplay_match(parent, match, aux)
return (0);
if (ia->ia_nirq > 0 &&
ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT)
ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ)
return (0);
if (ia->ia_ndrq > 0 &&
ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT)
ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ)
return (0);
if (pcdisplay_is_console(ia->ia_iot))

12
sys/dev/isa/pckbc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbc_isa.c,v 1.13 2004/03/24 17:26:53 drochner Exp $ */
/* $NetBSD: pckbc_isa.c,v 1.14 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1998
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.13 2004/03/24 17:26:53 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.14 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -77,21 +77,21 @@ pckbc_isa_match(parent, match, aux)
/* If values are hardwired to something that they can't be, punt. */
if (ia->ia_nio < 1 ||
(ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
(ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != IO_KBD))
return (0);
if (ia->ia_niomem > 0 &&
(ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT))
(ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM))
return (0);
if (ia->ia_nirq < 1 ||
(ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
(ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != 1 /*XXX*/))
return (0);
if (ia->ia_ndrq > 0 &&
(ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT))
(ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ))
return (0);
if (pckbc_is_console(iot, IO_KBD) == 0) {

12
sys/dev/isa/pcppi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcppi.c,v 1.10 2004/03/13 17:31:34 bjh21 Exp $ */
/* $NetBSD: pcppi.c,v 1.11 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.10 2004/03/13 17:31:34 bjh21 Exp $");
__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.11 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,20 +93,20 @@ pcppi_match(parent, match, aux)
/* If values are hardwired to something that they can't be, punt. */
if (ia->ia_nio < 1 ||
(ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
(ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != IO_PPI))
return (0);
if (ia->ia_niomem > 0 &&
(ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT))
(ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM))
return (0);
if (ia->ia_nirq > 0 &&
(ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT))
(ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ))
return (0);
if (ia->ia_ndrq > 0 &&
(ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT))
(ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ))
return (0);
rv = 0;

16
sys/dev/isa/pss.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pss.c,v 1.64 2003/05/03 18:11:28 wiz Exp $ */
/* $NetBSD: pss.c,v 1.65 2004/09/14 20:20:49 drochner Exp $ */
/* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */
@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pss.c,v 1.64 2003/05/03 18:11:28 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: pss.c,v 1.65 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -732,8 +732,8 @@ pssfind(parent, sc, ia)
return 0;
}
/* Need to probe for iobase when ISACF_PORT_DEFAULT {0x220 0x240} */
if (iobase == ISACF_PORT_DEFAULT) {
/* Need to probe for iobase when ISA_UNKNOWN_PORT {0x220 0x240} */
if (iobase == ISA_UNKNOWN_PORT) {
iobase = 0x220;
if ((inw(iobase+PSS_ID_VERS) & 0xff00) == 0x4500)
@ -765,7 +765,7 @@ pss_found:
outw(sc->sc_iobase+MIDI_CONFIG, 0);
outw(sc->sc_iobase+CD_CONFIG, 0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT) {
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ) {
int i;
for (i = 0; i < 16; i++) {
if (pss_testirq(sc, i) != 0)
@ -788,7 +788,7 @@ pss_found:
}
}
/* XXX Need to deal with ISACF_DRQ_DEFAULT */
/* XXX Need to deal with ISA_UNKNOWN_DRQ */
if (pss_testdma(sc, ia->ia_drq[0].ir_drq) == 0) {
printf("pss: configured DMA channel unavailable (%d)\n",
ia->ia_drq[0].ir_drq);
@ -856,7 +856,7 @@ spfind(parent, sc, ia)
}
/* Setup WSS interrupt and DMA if auto */
if (cf->cf_irq == ISACF_IRQ_DEFAULT) {
if (cf->cf_irq == ISA_UNKNOWN_IRQ) {
/* Find unused IRQ for WSS */
for (i = 0; i < 12; i++) {
@ -883,7 +883,7 @@ spfind(parent, sc, ia)
}
}
if (cf->cf_drq == ISACF_DRQ_DEFAULT) {
if (cf->cf_drq == ISA_UNKNOWN_DRQ) {
/* Find unused DMA channel for WSS */
for (i = 0; i < 4; i++) {
if (wss_dma_bits[i]) {

18
sys/dev/isa/rtfps.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rtfps.c,v 1.47 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: rtfps.c,v 1.48 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.47 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.48 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -97,9 +97,9 @@ rtfpsprobe(parent, self, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* if the first port is in use as console, then it. */
@ -151,12 +151,8 @@ rtfpsattach(parent, self, aux)
struct isa_attach_args *ia = aux;
struct commulti_attach_args ca;
static int irqport[] = {
ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT,
ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT,
ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT,
0x2f2, 0x6f2, 0x6f3,
ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT, ISACF_PORT_DEFAULT,
ISACF_PORT_DEFAULT
-1, -1, -1, -1, -1, -1, -1, -1,
-1, 0x2f2, 0x6f2, 0x6f3, -1, -1, -1, -1
};
bus_space_tag_t iot = ia->ia_iot;
int i, iobase, irq;
@ -167,7 +163,7 @@ rtfpsattach(parent, self, aux)
sc->sc_iobase = ia->ia_io[0].ir_addr;
irq = ia->ia_irq[0].ir_irq;
if (irq >= 16 || irqport[irq] == ISACF_PORT_DEFAULT) {
if (irq >= 16 || irqport[irq] == -1) {
printf("%s: invalid irq\n", sc->sc_dev.dv_xname);
return;
}

8
sys/dev/isa/satlink.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: satlink.c,v 1.22 2003/05/09 23:51:29 fvdl Exp $ */
/* $NetBSD: satlink.c,v 1.23 2004/09/14 20:20:49 drochner Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.22 2003/05/09 23:51:29 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.23 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -141,9 +141,9 @@ satlinkprobe(parent, match, aux)
return (0);
/* Don't allow wildcarding of iobase or drq. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
if (ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, SATLINK_IOSIZE, 0, &ioh))

8
sys/dev/isa/seagate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: seagate.c,v 1.54 2003/04/03 15:36:31 christos Exp $ */
/* $NetBSD: seagate.c,v 1.55 2004/09/14 20:20:49 drochner Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.54 2003/04/03 15:36:31 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.55 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -345,9 +345,9 @@ seaprobe(parent, match, aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* XXX XXX XXX */

14
sys/dev/isa/tcic2_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcic2_isa.c,v 1.10 2004/08/11 06:56:57 mycroft Exp $ */
/* $NetBSD: tcic2_isa.c,v 1.11 2004/09/14 20:20:49 drochner Exp $ */
/*
*
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.10 2004/08/11 06:56:57 mycroft Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.11 2004/09/14 20:20:49 drochner Exp $");
#undef TCICISADEBUG
@ -159,15 +159,15 @@ tcic_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_iomem[0].ir_addr == ISACF_IOMEM_DEFAULT)
if (ia->ia_iomem[0].ir_addr == ISA_UNKNOWN_IOMEM)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, TCIC_IOSIZE, 0, &ioh))
return (0);
if (ia->ia_iomem[0].ir_size == ISACF_IOSIZ_DEFAULT)
if (ia->ia_iomem[0].ir_size == ISA_UNKNOWN_IOSIZ)
msize = TCIC_MEMSIZE;
else
msize = ia->ia_iomem[0].ir_size;
@ -267,10 +267,10 @@ tcic_isa_attach(parent, self, aux)
*/
if (ia->ia_nirq < 1)
sc->irq = ISACF_IRQ_DEFAULT;
sc->irq = ISA_UNKNOWN_IRQ;
else
sc->irq = ia->ia_irq[0].ir_irq;
if (sc->irq == ISACF_IRQ_DEFAULT) {
if (sc->irq == ISA_UNKNOWN_IRQ) {
if (isa_intr_alloc(ic,
sc->validirqs & (tcic_isa_intr_alloc_mask & 0xff00),
IST_EDGE, &sc->irq)) {

8
sys/dev/isa/tcom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcom.c,v 1.8 2004/09/14 17:19:34 drochner Exp $ */
/* $NetBSD: tcom.c,v 1.9 2004/09/14 20:20:49 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.8 2004/09/14 17:19:34 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.9 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -144,9 +144,9 @@ tcomprobe(parent, self, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
/* if the first port is in use as console, then it. */

10
sys/dev/isa/uha_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uha_isa.c,v 1.26 2002/10/02 03:10:50 thorpej Exp $ */
/* $NetBSD: uha_isa.c,v 1.27 2004/09/14 20:20:49 drochner Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.26 2002/10/02 03:10:50 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.27 2004/09/14 20:20:49 drochner Exp $");
#include "opt_ddb.h"
@ -108,7 +108,7 @@ uha_isa_probe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, UHA_ISA_IOSIZE, 0, &ioh))
@ -119,10 +119,10 @@ uha_isa_probe(parent, match, aux)
bus_space_unmap(iot, ioh, UHA_ISA_IOSIZE);
if (rv) {
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != upd.sc_irq)
return (0);
if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT &&
if (ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ &&
ia->ia_drq[0].ir_drq != upd.sc_drq)
return (0);

12
sys/dev/isa/vga_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vga_isa.c,v 1.15 2002/10/02 03:10:50 thorpej Exp $ */
/* $NetBSD: vga_isa.c,v 1.16 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vga_isa.c,v 1.15 2002/10/02 03:10:50 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: vga_isa.c,v 1.16 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,12 +63,12 @@ vga_isa_match(struct device *parent, struct cfdata *match, void *aux)
/* If values are hardwired to something that they can't be, punt. */
if (ia->ia_nio < 1 ||
(ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT &&
(ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT &&
ia->ia_io[0].ir_addr != 0x3b0))
return (0);
if (ia->ia_niomem < 1 ||
(ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT &&
(ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM &&
ia->ia_iomem[0].ir_addr != 0xa0000))
return (0);
if (ia->ia_iomem[0].ir_size != 0 &&
@ -76,11 +76,11 @@ vga_isa_match(struct device *parent, struct cfdata *match, void *aux)
return (0);
if (ia->ia_nirq > 0 &&
ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT)
ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ)
return (0);
if (ia->ia_ndrq > 0 &&
ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT)
ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ)
return (0);
if (!vga_is_console(ia->ia_iot, WSDISPLAY_TYPE_ISAVGA) &&

12
sys/dev/isa/wdc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wdc_isa.c,v 1.45 2004/08/20 06:39:38 thorpej Exp $ */
/* $NetBSD: wdc_isa.c,v 1.46 2004/09/14 20:20:49 drochner Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.45 2004/08/20 06:39:38 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.46 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -104,11 +104,11 @@ wdc_isa_probe(struct device *parent, struct cfdata *match, void *aux)
if (ISA_DIRECT_CONFIG(ia))
return (0);
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
ia->ia_ndrq = 0;
memset(&wdc, 0, sizeof(wdc));
@ -186,7 +186,7 @@ wdc_isa_attach(struct device *parent, struct device *self, void *aux)
wdr->data32ioh = wdr->cmd_iohs[0];
#if 0
if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT) {
if (ia->ia_ndrq > 0 && ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ) {
sc->sc_drq = ia->ia_drq[0].ir_drq;
sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DMA;

14
sys/dev/isa/wds.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wds.c,v 1.57 2004/06/24 16:56:00 drochner Exp $ */
/* $NetBSD: wds.c,v 1.58 2004/09/14 20:20:49 drochner Exp $ */
/*
* XXX
@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.57 2004/06/24 16:56:00 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.58 2004/09/14 20:20:49 drochner Exp $");
#include "opt_ddb.h"
@ -277,7 +277,7 @@ wdsprobe(parent, match, aux)
return (0);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (bus_space_map(iot, ia->ia_io[0].ir_addr, WDS_ISA_IOSIZE, 0, &ioh))
@ -289,10 +289,10 @@ wdsprobe(parent, match, aux)
if (rv) {
#ifdef notyet
if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
ia->ia_irq[0].ir_irq != wpd.sc_irq)
return (0);
if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT &&
if (ia->ia_drq[0].ir_drq != ISA_UNKNOWN_DRQ &&
ia->ia_drq[0].ir_drq != wpd.sc_drq)
return (0);
@ -302,9 +302,9 @@ wdsprobe(parent, match, aux)
ia->ia_ndrq = 1;
ia->ia_drq[0].ir_drq = wpd.sc_drq;
#else
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if (ia->ia_drq[0].ir_drq == ISACF_DRQ_DEFAULT)
if (ia->ia_drq[0].ir_drq == ISA_UNKNOWN_DRQ)
return (0);
ia->ia_nirq = 1;

10
sys/dev/isa/wss_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wss_isa.c,v 1.16 2003/05/03 18:11:29 wiz Exp $ */
/* $NetBSD: wss_isa.c,v 1.17 2004/09/14 20:20:49 drochner Exp $ */
/*
* Copyright (c) 1994 John Brezak
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.16 2003/05/03 18:11:29 wiz Exp $");
__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.17 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -169,7 +169,7 @@ wssfind(parent, sc, probing, ia)
sc->wss_playdrq = ia->ia_drq[0].ir_drq;
sc->wss_ic = ia->ia_ic;
if (sc->wss_playdrq != ISACF_DRQ_DEFAULT &&
if (sc->wss_playdrq != ISA_UNKNOWN_DRQ &&
!isa_drq_isfree(sc->wss_ic, sc->wss_playdrq))
goto bad;
@ -189,14 +189,14 @@ wssfind(parent, sc, probing, ia)
recdrq = ia->ia_drq[1].ir_drq;
} else {
ndrq = 1;
recdrq = ISACF_IRQ_DEFAULT;
recdrq = ISA_UNKNOWN_DRQ;
}
if (ac->mode <= 1)
ndrq = 1;
sc->wss_recdrq =
ac->mode > 1 && ndrq > 1 &&
recdrq != ISACF_DRQ_DEFAULT ? recdrq : playdrq;
recdrq != ISA_UNKNOWN_DRQ ? recdrq : playdrq;
if (sc->wss_recdrq != sc->wss_playdrq && !isa_drq_isfree(sc->wss_ic,
sc->wss_recdrq))
goto bad;

8
sys/dev/isa/wt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wt.c,v 1.61 2003/05/09 23:51:29 fvdl Exp $ */
/* $NetBSD: wt.c,v 1.62 2004/09/14 20:20:49 drochner Exp $ */
/*
* Streamer tape driver.
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.61 2003/05/09 23:51:29 fvdl Exp $");
__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.62 2004/09/14 20:20:49 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -209,9 +209,9 @@ wtprobe(parent, match, aux)
if (ia->ia_ndrq < 1);
/* Disallow wildcarded i/o address. */
if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
if (ia->ia_io[0].ir_addr == ISA_UNKNOWN_PORT)
return (0);
if (ia->ia_irq[0].ir_irq == ISACF_IRQ_DEFAULT)
if (ia->ia_irq[0].ir_irq == ISA_UNKNOWN_IRQ)
return (0);
if (ia->ia_drq[0].ir_drq < 1 || ia->ia_drq[0].ir_drq > 3) {