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

adapt to ISA "unknown address" namespace separation

This commit is contained in:
drochner 2004-09-14 20:25:05 +00:00
parent 1308c6d767
commit 1134c44162
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/alpha/isa/mcclock_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcclock_isa.c,v 1.13 2002/10/02 04:06:38 thorpej Exp $ */
/* $NetBSD: mcclock_isa.c,v 1.14 2004/09/14 20:25:51 drochner Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.13 2002/10/02 04:06:38 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.14 2004/09/14 20:25:51 drochner Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -73,20 +73,20 @@ mcclock_isa_match(parent, match, aux)
bus_space_handle_t ioh;
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 != 0x70))
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);
if (bus_space_map(ia->ia_iot, 0x70, 0x2, 0, &ioh))

8
sys/arch/i386/isa/ahc_isa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ahc_isa.c,v 1.24 2003/12/04 12:42:54 keihan Exp $ */
/* $NetBSD: ahc_isa.c,v 1.25 2004/09/14 20:25:05 drochner Exp $ */
/*
* Product specific probe and attach routines for:
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.24 2003/12/04 12:42:54 keihan Exp $");
__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.25 2004/09/14 20:25:05 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -288,7 +288,7 @@ ahc_isa_match(ia, iobase)
if (irq < 0)
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) {
printf("ahc_isa_match: irq mismatch (kernel %d, card %d)\n",
ia->ia_irq[0].ir_irq, irq);
@ -336,7 +336,7 @@ ahc_isa_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 (ahc_isa_match(ia, ia->ia_io[0].ir_addr));
/*

8
sys/arch/i386/isa/lms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lms.c,v 1.44 2002/10/02 05:47:13 thorpej Exp $ */
/* $NetBSD: lms.c,v 1.45 2004/09/14 20:25:05 drochner Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.44 2002/10/02 05:47:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.45 2004/09/14 20:25:05 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -96,9 +96,9 @@ lmsprobe(parent, match, aux)
return (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)
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 the i/o space. */

8
sys/arch/i386/isa/mms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mms.c,v 1.41 2002/10/02 05:47:13 thorpej Exp $ */
/* $NetBSD: mms.c,v 1.42 2004/09/14 20:25:05 drochner Exp $ */
/*-
* Copyright (c) 1993, 1994 Charles M. Hannum.
@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.41 2002/10/02 05:47:13 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.42 2004/09/14 20:25:05 drochner Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -93,10 +93,10 @@ mmsprobe(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 the i/o space. */