Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Don't set the iobase and iosize members of pcmciabu...
details: https://anonhg.NetBSD.org/src/rev/32cb5bd24d7a
branches: trunk
changeset: 767677:32cb5bd24d7a
user: dyoung <dyoung%NetBSD.org@localhost>
date: Tue Jul 26 22:52:47 2011 +0000
description:
Don't set the iobase and iosize members of pcmciabus_attach_args because
they're not used in any meaningful way.
diffstat:
sys/arch/amiga/dev/gayle_pcmcia.c | 6 ++----
sys/arch/arm/at91/at91cf.c | 8 +++-----
sys/arch/arm/ep93xx/eppcic.c | 6 ++----
sys/arch/arm/imx/imx_pcic.c | 8 +++-----
sys/arch/arm/sa11x0/sa11x1_pcic.c | 6 ++----
sys/arch/arm/xscale/pxa2x0_pcic.c | 6 ++----
sys/arch/evbarm/g42xxeb/gb225_pcic.c | 2 --
sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c | 6 ++----
sys/arch/hpcarm/dev/ipaq_pcic.c | 6 ++----
sys/arch/hpcmips/dev/it8368.c | 8 +++-----
sys/arch/hpcmips/dev/plumpcmcia.c | 6 ++----
sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c | 6 ++----
sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c | 6 ++----
sys/arch/mips/alchemy/dev/aupcmcia.c | 7 ++-----
sys/arch/mmeye/dev/mmeyepcmcia.c | 6 ++----
sys/arch/sparc/dev/ts102.c | 4 +---
16 files changed, 32 insertions(+), 65 deletions(-)
diffs (truncated from 420 to 300 lines):
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/amiga/dev/gayle_pcmcia.c
--- a/sys/arch/amiga/dev/gayle_pcmcia.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/amiga/dev/gayle_pcmcia.c Tue Jul 26 22:52:47 2011 +0000
@@ -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) {
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/arm/at91/at91cf.c
--- a/sys/arch/arm/at91/at91cf.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/arm/at91/at91cf.c Tue Jul 26 22:52:47 2011 +0000
@@ -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);
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/arm/ep93xx/eppcic.c
--- a/sys/arch/arm/ep93xx/eppcic.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/arm/ep93xx/eppcic.c Tue Jul 26 22:52:47 2011 +0000
@@ -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);
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/arm/imx/imx_pcic.c
--- a/sys/arch/arm/imx/imx_pcic.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/arm/imx/imx_pcic.c Tue Jul 26 22:52:47 2011 +0000
@@ -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);
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/arm/sa11x0/sa11x1_pcic.c
--- a/sys/arch/arm/sa11x0/sa11x1_pcic.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/arm/sa11x0/sa11x1_pcic.c Tue Jul 26 22:52:47 2011 +0000
@@ -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,
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/arm/xscale/pxa2x0_pcic.c
--- a/sys/arch/arm/xscale/pxa2x0_pcic.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/arm/xscale/pxa2x0_pcic.c Tue Jul 26 22:52:47 2011 +0000
@@ -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);
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/evbarm/g42xxeb/gb225_pcic.c
--- a/sys/arch/evbarm/g42xxeb/gb225_pcic.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/evbarm/g42xxeb/gb225_pcic.c Tue Jul 26 22:52:47 2011 +0000
@@ -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,
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c
--- a/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c Tue Jul 26 22:52:47 2011 +0000
@@ -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 <nonaka%netbsd.org@localhost>
@@ -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);
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/hpcarm/dev/ipaq_pcic.c
--- a/sys/arch/hpcarm/dev/ipaq_pcic.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/hpcarm/dev/ipaq_pcic.c Tue Jul 26 22:52:47 2011 +0000
@@ -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",
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/hpcmips/dev/it8368.c
--- a/sys/arch/hpcmips/dev/it8368.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/hpcmips/dev/it8368.c Tue Jul 26 22:52:47 2011 +0000
@@ -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);
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/hpcmips/dev/plumpcmcia.c
--- a/sys/arch/hpcmips/dev/plumpcmcia.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/hpcmips/dev/plumpcmcia.c Tue Jul 26 22:52:47 2011 +0000
@@ -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))) {
diff -r 2200591020b2 -r 32cb5bd24d7a sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c
--- a/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Tue Jul 26 22:24:36 2011 +0000
+++ b/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Tue Jul 26 22:52:47 2011 +0000
@@ -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 $ */
/*-
Home |
Main Index |
Thread Index |
Old Index