Module Name: src
Committed By: dyoung
Date: Tue Jul 26 22:24:36 UTC 2011
Modified Files:
src/sys/dev/pcmcia: pcmcia.c pcmciachip.h pcmciavar.h
Log Message:
Don't copy iobase and iosize members from pcmciabus_attach_args to the
pcmcia_softc because they're not used in any meaningful way.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pcmcia/pcmcia.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pcmcia/pcmciachip.h
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pcmcia/pcmciavar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/pcmcia.c
diff -u src/sys/dev/pcmcia/pcmcia.c:1.93 src/sys/dev/pcmcia/pcmcia.c:1.94
--- src/sys/dev/pcmcia/pcmcia.c:1.93 Tue May 12 14:42:19 2009
+++ src/sys/dev/pcmcia/pcmcia.c Tue Jul 26 22:24:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.93 2009/05/12 14:42:19 cegger Exp $ */
+/* $NetBSD: pcmcia.c,v 1.94 2011/07/26 22:24:36 dyoung Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.93 2009/05/12 14:42:19 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.94 2011/07/26 22:24:36 dyoung Exp $");
#include "opt_pcmciaverbose.h"
@@ -133,8 +133,6 @@
sc->dev = self;
sc->pct = paa->pct;
sc->pch = paa->pch;
- sc->iobase = paa->iobase;
- sc->iosize = paa->iosize;
sc->ih = NULL;
Index: src/sys/dev/pcmcia/pcmciachip.h
diff -u src/sys/dev/pcmcia/pcmciachip.h:1.16 src/sys/dev/pcmcia/pcmciachip.h:1.17
--- src/sys/dev/pcmcia/pcmciachip.h:1.16 Tue May 12 14:42:19 2009
+++ src/sys/dev/pcmcia/pcmciachip.h Tue Jul 26 22:24:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciachip.h,v 1.16 2009/05/12 14:42:19 cegger Exp $ */
+/* $NetBSD: pcmciachip.h,v 1.17 2011/07/26 22:24:36 dyoung Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -143,8 +143,6 @@
const char *paa_busname; /* Bus name */
pcmcia_chipset_tag_t pct;
pcmcia_chipset_handle_t pch;
- bus_addr_t iobase; /* start i/o space allocation here */
- bus_size_t iosize; /* size of the i/o space range */
};
/* interfaces for the chipset to call pcmcia */
Index: src/sys/dev/pcmcia/pcmciavar.h
diff -u src/sys/dev/pcmcia/pcmciavar.h:1.34 src/sys/dev/pcmcia/pcmciavar.h:1.35
--- src/sys/dev/pcmcia/pcmciavar.h:1.34 Tue May 12 14:42:19 2009
+++ src/sys/dev/pcmcia/pcmciavar.h Tue Jul 26 22:24:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciavar.h,v 1.34 2009/05/12 14:42:19 cegger Exp $ */
+/* $NetBSD: pcmciavar.h,v 1.35 2011/07/26 22:24:36 dyoung Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -197,14 +197,6 @@
void *ih;
int sc_enabled_count; /* how many functions are
enabled */
-
- /*
- * These are passed down from the PCMCIA chip, and exist only
- * so that cards with Very Special address allocation needs
- * know what range they should be dealing with.
- */
- bus_addr_t iobase; /* start i/o space allocation here */
- bus_size_t iosize; /* size of the i/o space range */
};
struct pcmcia_cis_quirk {
