kick out the ioasic offset check which happens in submatch() now

This commit is contained in:
drochner 2004-08-26 18:07:12 +00:00
parent 131be74c33
commit 5b0932cc68
2 changed files with 4 additions and 20 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: scc.c,v 1.84 2004/04/25 06:23:41 matt Exp $ */
/* $NetBSD: scc.c,v 1.85 2004/08/26 18:08:04 drochner Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995,1996 Carnegie Mellon University
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.84 2004/04/25 06:23:41 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: scc.c,v 1.85 2004/08/26 18:08:04 drochner Exp $");
/*
* Intel 82530 dual usart chip driver. Supports the serial port(s) on the
@ -340,14 +340,6 @@ sccmatch(parent, cf, aux)
(strncmp(d->iada_modname, "scc", TC_ROM_LLEN)!= 0))
return (0);
/*
* Check user-specified offset against the ioasic offset.
* Allow it to be wildcarded.
*/
if (cf->cf_loc[IOASICCF_OFFSET] != IOASICCF_OFFSET_DEFAULT &&
cf->cf_loc[IOASICCF_OFFSET] != d->iada_offset)
return (0);
/* Get the address, and check it for validity. */
sccaddr = (void *)d->iada_addr;
#ifdef SPARSE

View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_ioasic.c,v 1.21 2003/03/06 00:38:28 matt Exp $ */
/* $NetBSD: zs_ioasic.c,v 1.22 2004/08/26 18:07:12 drochner Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.21 2003/03/06 00:38:28 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.22 2004/08/26 18:07:12 drochner Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -222,14 +222,6 @@ zs_ioasic_match(parent, cf, aux)
strncmp(d->iada_modname, "scc", TC_ROM_LLEN) != 0)
return (0);
/*
* Check user-specified offset against the ioasic offset.
* Allow it to be wildcarded.
*/
if (cf->cf_loc[IOASICCF_OFFSET] != IOASICCF_OFFSET_DEFAULT &&
cf->cf_loc[IOASICCF_OFFSET] != d->iada_offset)
return (0);
/*
* Find out the device address, and check it for validity.
*/