adapt to ISA "unknown address" namespace separation (purely mechanical,
as far as "grep" reaches)
This commit is contained in:
drochner
parent
22aae06570
commit
2db688402b
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mcclock_isa.c,v 1.5 2002/10/02 03:36:20 thorpej Exp $ */
|
||||
/* $NetBSD: mcclock_isa.c,v 1.6 2004/09/14 20:32:48 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.5 2002/10/02 03:36:20 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.6 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -74,20 +74,20 @@ mcclock_isa_match(struct device *parent, struct cfdata *match, void *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))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mcclock_isa.c,v 1.7 2003/10/29 18:17:50 tsutsui Exp $ */
|
||||
/* $NetBSD: mcclock_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $ */
|
||||
/* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */
|
||||
/* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */
|
||||
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.7 2003/10/29 18:17:50 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -119,20 +119,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 (!mcclock_isa_conf)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: opms_isa.c,v 1.5 2003/07/15 00:04:47 lukem Exp $ */
|
||||
/* $NetBSD: opms_isa.c,v 1.6 2004/09/14 20:32:48 drochner Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v 1.5 2003/07/15 00:04:47 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v 1.6 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -64,13 +64,13 @@ opms_isa_match(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)
|
||||
iobase = ia->ia_io[0].ir_addr;
|
||||
#if 0 /* XXX isa.c */
|
||||
if (ia->ia_iosize != 0)
|
||||
iosize = ia->ia_iosize;
|
||||
#endif
|
||||
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;
|
||||
|
||||
#if 0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pccons_isa.c,v 1.5 2003/07/15 00:04:47 lukem Exp $ */
|
||||
/* $NetBSD: pccons_isa.c,v 1.6 2004/09/14 20:32:48 drochner Exp $ */
|
||||
/* NetBSD: vga_isa.c,v 1.4 2000/08/14 20:14:51 thorpej Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pccons_isa.c,v 1.5 2003/07/15 00:04:47 lukem Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pccons_isa.c,v 1.6 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -65,7 +65,7 @@ pccons_isa_match(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)
|
||||
iobase = ia->ia_io[0].ir_addr;
|
||||
#if 0 /* XXX isa.c */
|
||||
if (ia->ia_iosize != 0)
|
||||
|
|
@ -73,14 +73,14 @@ pccons_isa_match(parent, match, aux)
|
|||
#endif
|
||||
if (ia->ia_niomem < 1)
|
||||
return (0);
|
||||
if (ia->ia_iomem[0].ir_addr != ISACF_IOMEM_DEFAULT)
|
||||
if (ia->ia_iomem[0].ir_addr != ISA_UNKNOWN_IOMEM)
|
||||
maddr = ia->ia_iomem[0].ir_addr;
|
||||
if (ia->ia_iomem[0].ir_size != ISACF_IOSIZ_DEFAULT)
|
||||
if (ia->ia_iomem[0].ir_size != ISA_UNKNOWN_IOSIZ)
|
||||
msize = ia->ia_iomem[0].ir_size;
|
||||
|
||||
if (ia->ia_nirq < 1)
|
||||
return (0);
|
||||
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;
|
||||
|
||||
#if 0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: timer_isa.c,v 1.7 2003/08/07 16:26:50 agc Exp $ */
|
||||
/* $NetBSD: timer_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $ */
|
||||
/* $OpenBSD: clock_mc.c,v 1.9 1998/03/16 09:38:26 pefo Exp $ */
|
||||
/* NetBSD: clock_mc.c,v 1.2 1995/06/28 04:30:30 cgd Exp */
|
||||
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: timer_isa.c,v 1.7 2003/08/07 16:26:50 agc Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: timer_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -133,21 +133,21 @@ timer_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 != IO_TIMER1))
|
||||
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 &&
|
||||
ia->ia_irq[0].ir_irq != TIMER_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 (!timer_isa_conf)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: fdcisa.c,v 1.8 2003/09/25 19:06:19 mycroft Exp $ */
|
||||
/* $NetBSD: fdcisa.c,v 1.9 2004/09/14 20:32:48 drochner Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1.8 2003/09/25 19:06:19 mycroft Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1.9 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -132,14 +132,14 @@ fdc_isa_probe(parent, cfp, 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);
|
||||
|
||||
/* 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. */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mcclock_isa.c,v 1.4 2002/10/02 05:12:54 thorpej Exp $ */
|
||||
/* $NetBSD: mcclock_isa.c,v 1.5 2004/09/14 20:32:48 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.4 2002/10/02 05:12:54 thorpej Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.5 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -73,20 +73,20 @@ mcclock_isa_match(struct device *parent, struct cfdata *match, void *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 != IO_RTC))
|
||||
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, IO_RTC, 0x2, 0, &ioh))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mkclock_isa.c,v 1.7 2003/11/01 22:48:58 tsutsui Exp $ */
|
||||
/* $NetBSD: mkclock_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.7 2003/11/01 22:48:58 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -91,20 +91,20 @@ mkclock_isa_match(struct device *parent, struct cfdata *match, void *aux)
|
|||
found = 0;
|
||||
|
||||
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 != 0x74))
|
||||
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);
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mcclock_isa.c,v 1.12 2004/03/10 15:19:22 nonaka Exp $ */
|
||||
/* $NetBSD: mcclock_isa.c,v 1.13 2004/09/14 20:32:48 drochner Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.12 2004/03/10 15:19:22 nonaka Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mcclock_isa.c,v 1.13 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
|
|
@ -71,20 +71,20 @@ mcclock_isa_match(parent, match, aux)
|
|||
found = 0;
|
||||
|
||||
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);
|
||||
|
||||
sc = &mc146818;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: mkclock_isa.c,v 1.7 2004/03/01 23:49:12 kleink Exp $ */
|
||||
/* $NetBSD: mkclock_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2002 The NetBSD Foundation, Inc.
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.7 2004/03/01 23:49:12 kleink Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: mkclock_isa.c,v 1.8 2004/09/14 20:32:48 drochner Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
|
|
@ -91,20 +91,20 @@ mkclock_isa_match(struct device *parent, struct cfdata *match, void *aux)
|
|||
found = 0;
|
||||
|
||||
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 != 0x74))
|
||||
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 (res->VitalProductData.NvramSize != MK48T18_CLKSZ)
|
||||
|
|
|
|||
Loading…
Reference in New Issue