Module Name: src
Committed By: dyoung
Date: Tue Jul 26 22:52:49 UTC 2011
Modified Files:
src/sys/arch/amiga/dev: gayle_pcmcia.c
src/sys/arch/arm/at91: at91cf.c
src/sys/arch/arm/ep93xx: eppcic.c
src/sys/arch/arm/imx: imx_pcic.c
src/sys/arch/arm/sa11x0: sa11x1_pcic.c
src/sys/arch/arm/xscale: pxa2x0_pcic.c
src/sys/arch/evbarm/g42xxeb: gb225_pcic.c
src/sys/arch/evbsh3/ap_ms104_sh4: shpcmcia.c
src/sys/arch/hpcarm/dev: ipaq_pcic.c
src/sys/arch/hpcmips/dev: it8368.c plumpcmcia.c
src/sys/arch/hpcsh/dev/hd64461: hd64461pcmcia.c
src/sys/arch/hpcsh/dev/hd64465: hd64465pcmcia.c
src/sys/arch/mips/alchemy/dev: aupcmcia.c
src/sys/arch/mmeye/dev: mmeyepcmcia.c
src/sys/arch/sparc/dev: ts102.c
Log Message:
Don't set the iobase and iosize members of pcmciabus_attach_args because
they're not used in any meaningful way.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amiga/dev/gayle_pcmcia.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91cf.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ep93xx/eppcic.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx_pcic.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/sa11x0/sa11x1_pcic.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/pxa2x0_pcic.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/dev/ipaq_pcic.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcmips/dev/it8368.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpcmips/dev/plumpcmcia.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/alchemy/dev/aupcmcia.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/mmeye/dev/mmeyepcmcia.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/dev/ts102.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/gayle_pcmcia.c
diff -u src/sys/arch/amiga/dev/gayle_pcmcia.c:1.24 src/sys/arch/amiga/dev/gayle_pcmcia.c:1.25
--- src/sys/arch/amiga/dev/gayle_pcmcia.c:1.24 Thu Jan 13 22:02:05 2011
+++ src/sys/arch/amiga/dev/gayle_pcmcia.c Tue Jul 26 22:52:47 2011
@@ -1,9 +1,9 @@
-/* $NetBSD: gayle_pcmcia.c,v 1.24 2011/01/13 22:02:05 phx Exp $ */
+/* $NetBSD: gayle_pcmcia.c,v 1.25 2011/07/26 22:52:47 dyoung Exp $ */
/* public domain */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.24 2011/01/13 22:02:05 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle_pcmcia.c,v 1.25 2011/07/26 22:52:47 dyoung Exp $");
/* PCMCIA front-end driver for A1200's and A600's. */
@@ -174,8 +174,6 @@
paa.paa_busname = "pcmcia";
paa.pct = &chip_functions;
paa.pch = &self->devs[0];
- paa.iobase = 0;
- paa.iosize = 0;
self->devs[0].card =
config_found(myself, &paa, simple_devprint);
if (self->devs[0].card == NULL) {
Index: src/sys/arch/arm/at91/at91cf.c
diff -u src/sys/arch/arm/at91/at91cf.c:1.3 src/sys/arch/arm/at91/at91cf.c:1.4
--- src/sys/arch/arm/at91/at91cf.c:1.3 Fri Jul 1 19:31:17 2011
+++ src/sys/arch/arm/at91/at91cf.c Tue Jul 26 22:52:47 2011
@@ -1,5 +1,5 @@
-/* $Id: at91cf.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
-/* $NetBSD: at91cf.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
+/* $Id: at91cf.c,v 1.4 2011/07/26 22:52:47 dyoung Exp $ */
+/* $NetBSD: at91cf.c,v 1.4 2011/07/26 22:52:47 dyoung Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.4 2011/07/26 22:52:47 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -228,8 +228,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&at91cf_functions;
paa.pch = (pcmcia_chipset_handle_t)ph;
- paa.iobase = ph->ph_space[IO].base;
- paa.iosize = ph->ph_space[IO].size;
ph->ph_card = config_found_ia(sc->sc_dev, "pcmciabus", &paa,
at91cf_print);
Index: src/sys/arch/arm/ep93xx/eppcic.c
diff -u src/sys/arch/arm/ep93xx/eppcic.c:1.5 src/sys/arch/arm/ep93xx/eppcic.c:1.6
--- src/sys/arch/arm/ep93xx/eppcic.c:1.5 Fri Jul 1 19:31:17 2011
+++ src/sys/arch/arm/ep93xx/eppcic.c Tue Jul 26 22:52:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: eppcic.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: eppcic.c,v 1.6 2011/07/26 22:52:47 dyoung Exp $ */
/*
* Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.5 2011/07/01 19:31:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.6 2011/07/26 22:52:47 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -244,8 +244,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&eppcic_functions;
paa.pch = (pcmcia_chipset_handle_t)ph;
- paa.iobase = ph->ph_space[IO].base;
- paa.iosize = ph->ph_space[IO].size;
ph->ph_card = config_found_ia((void*)sc, "pcmciabus", &paa,
eppcic_print);
Index: src/sys/arch/arm/imx/imx_pcic.c
diff -u src/sys/arch/arm/imx/imx_pcic.c:1.4 src/sys/arch/arm/imx/imx_pcic.c:1.5
--- src/sys/arch/arm/imx/imx_pcic.c:1.4 Fri Jul 1 20:27:50 2011
+++ src/sys/arch/arm/imx/imx_pcic.c Tue Jul 26 22:52:47 2011
@@ -1,4 +1,4 @@
-/* $Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
+/* $Id: imx_pcic.c,v 1.5 2011/07/26 22:52:47 dyoung Exp $ */
/*
* IMX CF interface to pcic/pcmcia
@@ -6,7 +6,7 @@
* Sun Apr 1 21:42:37 PDT 2007
*/
-/* $NetBSD: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $ */
+/* $NetBSD: imx_pcic.c,v 1.5 2011/07/26 22:52:47 dyoung Exp $ */
/* $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $ */
/*
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.4 2011/07/01 20:27:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.5 2011/07/26 22:52:47 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -407,8 +407,6 @@
paa.pct = (pcmcia_chipset_tag_t)&imx_pcic_pcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)so;
printf("%s: sc_pa %lx\n", __func__, sc->sc_pa);
- paa.iobase = sc->sc_pa;
- paa.iosize = 0x2000;
so->pcmcia = config_found_ia(&sc->sc_dev, "pcmciabus", &paa,
imx_pcic_print);
Index: src/sys/arch/arm/sa11x0/sa11x1_pcic.c
diff -u src/sys/arch/arm/sa11x0/sa11x1_pcic.c:1.21 src/sys/arch/arm/sa11x0/sa11x1_pcic.c:1.22
--- src/sys/arch/arm/sa11x0/sa11x1_pcic.c:1.21 Fri Jul 1 20:31:39 2011
+++ src/sys/arch/arm/sa11x0/sa11x1_pcic.c Tue Jul 26 22:52:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sa11x1_pcic.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $ */
+/* $NetBSD: sa11x1_pcic.c,v 1.22 2011/07/26 22:52:47 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x1_pcic.c,v 1.21 2011/07/01 20:31:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x1_pcic.c,v 1.22 2011/07/26 22:52:47 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,8 +104,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&sa11x0_pcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)&sc->sc_socket[i];
- paa.iobase = 0;
- paa.iosize = 0x4000000;
sc->sc_socket[i].pcmcia =
config_found_ia(sc->sc_pc.sc_dev, "pcmciabus", &paa,
Index: src/sys/arch/arm/xscale/pxa2x0_pcic.c
diff -u src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.9 src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.10
--- src/sys/arch/arm/xscale/pxa2x0_pcic.c:1.9 Fri Jul 1 20:32:51 2011
+++ src/sys/arch/arm/xscale/pxa2x0_pcic.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_pcic.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $ */
+/* $NetBSD: pxa2x0_pcic.c,v 1.10 2011/07/26 22:52:48 dyoung Exp $ */
/* $OpenBSD: pxa2x0_pcic.c,v 1.17 2005/12/14 15:08:51 uwe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.9 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.c,v 1.10 2011/07/26 22:52:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -377,8 +377,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&pxapcic_pcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)so;
- paa.iobase = 0;
- paa.iosize = 0x4000000;
so->pcmcia = config_found_ia(sc->sc_dev, "pcmciabus", &paa,
pxapcic_print);
Index: src/sys/arch/evbarm/g42xxeb/gb225_pcic.c
diff -u src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.11 src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.12
--- src/sys/arch/evbarm/g42xxeb/gb225_pcic.c:1.11 Fri Jul 1 20:38:17 2011
+++ src/sys/arch/evbarm/g42xxeb/gb225_pcic.c Tue Jul 26 22:52:48 2011
@@ -180,8 +180,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&sa11x0_pcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)&sc->sc_socket[i].ss;
- paa.iobase = 0;
- paa.iosize = 0x4000000;
sc->sc_socket[i].ss.pcmcia =
config_found_ia(sc->sc_pc.sc_dev,
Index: src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
diff -u src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.1 src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.2
--- src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c:1.1 Tue Apr 6 15:54:29 2010
+++ src/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: shpcmcia.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $ */
+/* $NetBSD: shpcmcia.c,v 1.2 2011/07/26 22:52:48 dyoung Exp $ */
/*-
* Copyright (c) 2009 NONAKA Kimihiro <non...@netbsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.1 2010/04/06 15:54:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcmcia.c,v 1.2 2011/07/26 22:52:48 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -312,8 +312,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)h->sc->sc_pct;
paa.pch = (pcmcia_chipset_handle_t)h;
- paa.iobase = h->sc->sc_iobase;
- paa.iosize = h->sc->sc_iosize;
h->pcmcia = config_found_ia(h->sc->sc_dev, "pcmciabus", &paa,
shpcmcia_print);
Index: src/sys/arch/hpcarm/dev/ipaq_pcic.c
diff -u src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.20 src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.21
--- src/sys/arch/hpcarm/dev/ipaq_pcic.c:1.20 Tue Jul 19 15:37:38 2011
+++ src/sys/arch/hpcarm/dev/ipaq_pcic.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ipaq_pcic.c,v 1.20 2011/07/19 15:37:38 dyoung Exp $ */
+/* $NetBSD: ipaq_pcic.c,v 1.21 2011/07/26 22:52:48 dyoung Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.20 2011/07/19 15:37:38 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipaq_pcic.c,v 1.21 2011/07/26 22:52:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,8 +125,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&sa11x0_pcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)&sc->sc_socket[i];
- paa.iobase = 0;
- paa.iosize = 0x4000000;
sc->sc_socket[i].pcmcia =
config_found_ia(sc->sc_pc.sc_dev, "pcmciabus",
Index: src/sys/arch/hpcmips/dev/it8368.c
diff -u src/sys/arch/hpcmips/dev/it8368.c:1.22 src/sys/arch/hpcmips/dev/it8368.c:1.23
--- src/sys/arch/hpcmips/dev/it8368.c:1.22 Mon Apr 28 20:23:21 2008
+++ src/sys/arch/hpcmips/dev/it8368.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: it8368.c,v 1.22 2008/04/28 20:23:21 martin Exp $ */
+/* $NetBSD: it8368.c,v 1.23 2011/07/26 22:52:48 dyoung Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.22 2008/04/28 20:23:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: it8368.c,v 1.23 2011/07/26 22:52:48 dyoung Exp $");
#undef WINCE_DEFAULT_SETTING /* for debug */
#undef IT8368DEBUG
@@ -379,9 +379,7 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&it8368_functions;
paa.pch = (pcmcia_chipset_handle_t)sc;
- paa.iobase = 0;
- paa.iosize = sc->sc_csiosize;
-
+
if ((sc->sc_pcmcia = config_found_ia((void*)sc, "pcmciabus", &paa,
it8368_print))) {
it8368_init_socket(sc);
Index: src/sys/arch/hpcmips/dev/plumpcmcia.c
diff -u src/sys/arch/hpcmips/dev/plumpcmcia.c:1.24 src/sys/arch/hpcmips/dev/plumpcmcia.c:1.25
--- src/sys/arch/hpcmips/dev/plumpcmcia.c:1.24 Wed Mar 18 10:22:28 2009
+++ src/sys/arch/hpcmips/dev/plumpcmcia.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: plumpcmcia.c,v 1.24 2009/03/18 10:22:28 cegger Exp $ */
+/* $NetBSD: plumpcmcia.c,v 1.25 2011/07/26 22:52:48 dyoung Exp $ */
/*
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.24 2009/03/18 10:22:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.25 2011/07/26 22:52:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -307,8 +307,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&plumpcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)ph;
- paa.iobase = 0;
- paa.iosize = ph->ph_iosize;
if ((ph->ph_pcmcia = config_found_ia((void*)sc, "pcmciabus", &paa,
plumpcmcia_print))) {
Index: src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.48 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.49
--- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.48 Wed Jul 20 20:46:49 2011
+++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64461pcmcia.c,v 1.48 2011/07/20 20:46:49 dyoung Exp $ */
+/* $NetBSD: hd64461pcmcia.c,v 1.49 2011/07/26 22:52:48 dyoung Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.48 2011/07/20 20:46:49 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.49 2011/07/26 22:52:48 dyoung Exp $");
#include "opt_hd64461pcmcia.h"
@@ -418,8 +418,6 @@
paa.paa_busname = "pcmcia";
paa.pch = (pcmcia_chipset_handle_t)ch;
- paa.iobase = ch->ch_iobase;
- paa.iosize = ch->ch_iosize;
ch->ch_pcmcia = config_found_sm_loc(parent, "pcmciabus", NULL, &paa,
hd64461pcmcia_print, hd64461pcmcia_submatch);
Index: src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c
diff -u src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.27 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.28
--- src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.27 Tue Jul 19 15:30:52 2011
+++ src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c Tue Jul 26 22:52:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64465pcmcia.c,v 1.27 2011/07/19 15:30:52 dyoung Exp $ */
+/* $NetBSD: hd64465pcmcia.c,v 1.28 2011/07/26 22:52:48 dyoung Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.27 2011/07/19 15:30:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.28 2011/07/26 22:52:48 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -363,8 +363,6 @@
paa.paa_busname = "pcmcia";
paa.pch = (pcmcia_chipset_handle_t)ch;
- paa.iobase = ch->ch_iobase;
- paa.iosize = ch->ch_iosize;
ch->ch_pcmcia = config_found_sm_loc(parent, "pcmciabus", NULL, &paa,
hd64465pcmcia_print, hd64465pcmcia_submatch);
Index: src/sys/arch/mips/alchemy/dev/aupcmcia.c
diff -u src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.6 src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.7
--- src/sys/arch/mips/alchemy/dev/aupcmcia.c:1.6 Tue Jan 8 13:26:26 2008
+++ src/sys/arch/mips/alchemy/dev/aupcmcia.c Tue Jul 26 22:52:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: aupcmcia.c,v 1.6 2008/01/08 13:26:26 dogcow Exp $ */
+/* $NetBSD: aupcmcia.c,v 1.7 2011/07/26 22:52:49 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -35,7 +35,7 @@
/* #include "pci.h" */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aupcmcia.c,v 1.6 2008/01/08 13:26:26 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aupcmcia.c,v 1.7 2011/07/26 22:52:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -268,9 +268,6 @@
paa.pct = sc->sc_pct;
paa.pch = (pcmcia_chipset_handle_t)sp;
- paa.iobase = 0;
- paa.iosize = AUPCMCIA_MAP_SIZE;
-
sp->as_pcmcia = config_found(&sc->sc_dev, &paa, aupcm_print);
/* if no pcmcia, make sure slot is powered down */
Index: src/sys/arch/mmeye/dev/mmeyepcmcia.c
diff -u src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.20 src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.21
--- src/sys/arch/mmeye/dev/mmeyepcmcia.c:1.20 Tue Jul 19 15:17:20 2011
+++ src/sys/arch/mmeye/dev/mmeyepcmcia.c Tue Jul 26 22:52:49 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mmeyepcmcia.c,v 1.20 2011/07/19 15:17:20 dyoung Exp $ */
+/* $NetBSD: mmeyepcmcia.c,v 1.21 2011/07/26 22:52:49 dyoung Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.20 2011/07/19 15:17:20 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmeyepcmcia.c,v 1.21 2011/07/26 22:52:49 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -360,8 +360,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t) h->sc->pct;
paa.pch = (pcmcia_chipset_handle_t) h;
- paa.iobase = h->sc->iobase;
- paa.iosize = h->sc->iosize;
h->pcmcia = config_found_ia(&h->sc->dev, "pcmciabus", &paa,
mmeyepcmcia_print);
Index: src/sys/arch/sparc/dev/ts102.c
diff -u src/sys/arch/sparc/dev/ts102.c:1.15 src/sys/arch/sparc/dev/ts102.c:1.16
--- src/sys/arch/sparc/dev/ts102.c:1.15 Fri Jul 1 18:50:42 2011
+++ src/sys/arch/sparc/dev/ts102.c Tue Jul 26 22:52:49 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: ts102.c,v 1.14 2005/01/27 17:03:23 millert Exp $ */
-/* $NetBSD: ts102.c,v 1.15 2011/07/01 18:50:42 dyoung Exp $ */
+/* $NetBSD: ts102.c,v 1.16 2011/07/26 22:52:49 dyoung Exp $ */
/*
* Copyright (c) 2003, 2004, Miodrag Vallat.
* Copyright (c) 2005, Michael Lorenz.
@@ -407,8 +407,6 @@
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)td->td_parent->sc_pct;
paa.pch = (pcmcia_chipset_handle_t)td;
- paa.iobase = 0;
- paa.iosize = iosize;
td->td_pcmcia = config_found(td->td_parent->sc_dev, &paa, tslot_print);
