summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorsoren <soren@NetBSD.org>2001-12-15 13:23:20 +0000
committersoren <soren@NetBSD.org>2001-12-15 13:23:20 +0000
commit875bff09620594a042776c2d05fa04450b3e6cd2 (patch)
tree202ab11db883c9c45bc3583f83a2ea1c0101bb77 /sys/dev
parent3514260fd45824aa279f045175859a301cab334b (diff)
To make dev/pcmcia work on platforms with 64-bit bus_addr_t and
32-bit bus_size_t (sparc), change the pcmcia_mem_map(9) offsetp argument to bus_size_t as it is used as a bus_space offset.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/i82365.c6
-rw-r--r--sys/dev/ic/i82365var.h4
-rw-r--r--sys/dev/ic/pckbc.c31
-rw-r--r--sys/dev/ic/tcic2.c6
-rw-r--r--sys/dev/ic/tcic2var.h4
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/if_cnw.c6
-rw-r--r--sys/dev/pcmcia/if_mbe_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c8
-rw-r--r--sys/dev/pcmcia/if_ray.c6
-rw-r--r--sys/dev/pcmcia/if_tr_pcmcia.c6
-rw-r--r--sys/dev/pcmcia/pcmcia.c5
-rw-r--r--sys/dev/pcmcia/pcmciachip.h4
-rw-r--r--sys/dev/pcmcia/pcmciavar.h8
-rw-r--r--sys/dev/sbus/stp4020.c8
15 files changed, 57 insertions, 57 deletions
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 2365ba7ed9c..7a61f8b5a89 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.64 2001/11/15 09:48:06 lukem Exp $ */
+/* $NetBSD: i82365.c,v 1.65 2001/12/15 13:23:21 soren Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.64 2001/11/15 09:48:06 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.65 2001/12/15 13:23:21 soren Exp $");
#define PCICDEBUG
@@ -1013,7 +1013,7 @@ pcic_chip_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
bus_addr_t card_addr;
bus_size_t size;
struct pcmcia_mem_handle *pcmhp;
- bus_addr_t *offsetp;
+ bus_size_t *offsetp;
int *windowp;
{
struct pcic_handle *h = (struct pcic_handle *) pch;
diff --git a/sys/dev/ic/i82365var.h b/sys/dev/ic/i82365var.h
index 93464db5fde..0fe1b946911 100644
--- a/sys/dev/ic/i82365var.h
+++ b/sys/dev/ic/i82365var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365var.h,v 1.15 2000/03/23 07:01:31 thorpej Exp $ */
+/* $NetBSD: i82365var.h,v 1.16 2001/12/15 13:23:21 soren Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -173,7 +173,7 @@ int pcic_chip_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t,
void pcic_chip_mem_free __P((pcmcia_chipset_handle_t,
struct pcmcia_mem_handle *));
int pcic_chip_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t,
- bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *));
+ bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *));
void pcic_chip_mem_unmap __P((pcmcia_chipset_handle_t, int));
int pcic_chip_io_alloc __P((pcmcia_chipset_handle_t, bus_addr_t,
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 8ddd1fb2e14..e1691cfff39 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.19 2001/12/06 20:00:58 augustss Exp $ */
+/* $NetBSD: pckbc.c,v 1.20 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 1998
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.19 2001/12/06 20:00:58 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.20 2001/12/15 13:23:22 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,11 +53,13 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.19 2001/12/06 20:00:58 augustss Exp $");
#include "rnd.h"
#include "locators.h"
-#ifdef __HAVE_NWSCONS /* XXX: this port uses sys/dev/pckbc */
-#include "pckbd.h"
-#else /* ie: only md drivers attach to pckbc */
-#define NPCKBD 0
+/* XXX for pcconskbd_cnattach() prototype */
+#ifdef __BROKEN_HAS_PCCONS
+#include <machine/pccons.h>
#endif
+
+#include "pckbd.h"
+
#if (NPCKBD > 0)
#include <dev/pckbc/pckbdvar.h>
#endif
@@ -943,6 +945,10 @@ pckbcintr(vsc)
for(;;) {
stat = bus_space_read_1(t->t_iot, t->t_ioh_c, 0);
+#if 0
+/* XXX soren XXX */
+printf("pckbcintr %x\n", stat);
+#endif
if (!(stat & KBS_DIB))
break;
@@ -1028,16 +1034,13 @@ pckbc_cnattach(iot, addr, cmd_offset, slot)
res = pckbd_cnattach(&pckbc_consdata, slot);
#else
/*
- * XXX This should be replaced with the `notyet' case
- * XXX when all of the old PC-style console drivers
- * XXX have gone away. When that happens, all of
- * XXX the pckbc_machdep_cnattach() should be purged,
- * XXX as well.
+ * XXX This should be removed when all of the old
+ * PC-style console drivers have gone away.
*/
-#ifdef notyet
- res = ENXIO;
+#ifdef __BROKEN_HAS_PCCONS
+ res = pcconskbd_cnattach(&pckbc_consdata, slot);
#else
- res = pckbc_machdep_cnattach(&pckbc_consdata, slot);
+ res = ENXIO;
#endif
#endif /* NPCKBD > 0 */
}
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index e4a8b7f2e87..d1d6ff8d935 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.8 2001/11/15 09:48:08 lukem Exp $ */
+/* $NetBSD: tcic2.c,v 1.9 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.8 2001/11/15 09:48:08 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.9 2001/12/15 13:23:22 soren Exp $");
#undef TCICDEBUG
@@ -941,7 +941,7 @@ tcic_chip_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
bus_addr_t card_addr;
bus_size_t size;
struct pcmcia_mem_handle *pcmhp;
- bus_addr_t *offsetp;
+ bus_size_t *offsetp;
int *windowp;
{
struct tcic_handle *h = (struct tcic_handle *) pch;
diff --git a/sys/dev/ic/tcic2var.h b/sys/dev/ic/tcic2var.h
index ad741732a00..d39dcf36716 100644
--- a/sys/dev/ic/tcic2var.h
+++ b/sys/dev/ic/tcic2var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2var.h,v 1.1 1999/03/23 20:04:14 bad Exp $ */
+/* $NetBSD: tcic2var.h,v 1.2 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -168,7 +168,7 @@ int tcic_chip_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t,
void tcic_chip_mem_free __P((pcmcia_chipset_handle_t,
struct pcmcia_mem_handle *));
int tcic_chip_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t,
- bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *));
+ bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *));
void tcic_chip_mem_unmap __P((pcmcia_chipset_handle_t, int));
int tcic_chip_io_alloc __P((pcmcia_chipset_handle_t, bus_addr_t,
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index f92aac45c54..68bee213664 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.21 2001/11/13 07:26:32 lukem Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.22 2001/12/15 13:23:22 soren Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.21 2001/11/13 07:26:32 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.22 2001/12/15 13:23:22 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -278,7 +278,7 @@ awi_pcmcia_attach(parent, self, aux)
const struct awi_pcmcia_product *app;
struct pcmcia_attach_args *pa = aux;
struct pcmcia_config_entry *cfe;
- bus_addr_t memoff;
+ bus_size_t memoff;
app = awi_pcmcia_lookup(pa);
if (app == NULL)
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 26837103583..1e3844e286e 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.19 2001/11/13 07:26:33 lukem Exp $ */
+/* $NetBSD: if_cnw.c,v 1.20 2001/12/15 13:23:22 soren Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.19 2001/11/13 07:26:33 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.20 2001/12/15 13:23:22 soren Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -207,7 +207,7 @@ struct cnw_softc {
bus_space_handle_t sc_ioh; /* ...bus_space handle */
#endif
struct pcmcia_mem_handle sc_pcmemh; /* PCMCIA memory handle */
- bus_addr_t sc_memoff; /* ...offset */
+ bus_size_t sc_memoff; /* ...offset */
int sc_memwin; /* ...window */
bus_space_tag_t sc_memt; /* ...bus_space tag */
bus_space_handle_t sc_memh; /* ...bus_space handle */
diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c
index 41acde0e846..a401d6bb16d 100644
--- a/sys/dev/pcmcia/if_mbe_pcmcia.c
+++ b/sys/dev/pcmcia/if_mbe_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_pcmcia.c,v 1.21 2001/11/13 07:26:33 lukem Exp $ */
+/* $NetBSD: if_mbe_pcmcia.c,v 1.22 2001/12/15 13:23:22 soren Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.21 2001/11/13 07:26:33 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.22 2001/12/15 13:23:22 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -343,7 +343,7 @@ mbe_pcmcia_get_enaddr_from_mem(psc, ea)
{
struct mb86960_softc *sc = &psc->sc_mb86960;
struct pcmcia_mem_handle pcmh;
- bus_addr_t offset;
+ bus_size_t offset;
int i, mwindow, rv = 1;
if (ea->maddr < 0)
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 49a0b266ae6..a93c1b01636 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.83 2001/11/13 07:26:33 lukem Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.84 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.83 2001/11/13 07:26:33 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.84 2001/12/15 13:23:22 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -858,7 +858,7 @@ ne_pcmcia_get_enaddr(psc, maddr, myea)
struct ne2000_softc *nsc = &psc->sc_ne2000;
struct dp8390_softc *dsc = &nsc->sc_dp8390;
struct pcmcia_mem_handle pcmh;
- bus_addr_t offset;
+ bus_size_t offset;
u_int8_t *enaddr = NULL;
int j, mwindow;
@@ -917,7 +917,7 @@ ne_pcmcia_ax88190_set_iobase(psc)
struct ne2000_softc *nsc = &psc->sc_ne2000;
struct dp8390_softc *dsc = &nsc->sc_dp8390;
struct pcmcia_mem_handle pcmh;
- bus_addr_t offset;
+ bus_size_t offset;
int rv = 1, mwindow;
u_int last_liobase, new_liobase;
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 3543416dfe3..e093b77fd5b 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.30 2001/12/15 12:01:55 soren Exp $ */
+/* $NetBSD: if_ray.c,v 1.31 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
* All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.30 2001/12/15 12:01:55 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.31 2001/12/15 13:23:22 soren Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -518,7 +518,7 @@ ray_attach(parent, self, aux)
struct pcmcia_attach_args *pa;
struct ray_softc *sc;
struct ifnet *ifp;
- bus_addr_t memoff;
+ bus_size_t memoff;
char devinfo[256];
pa = aux;
diff --git a/sys/dev/pcmcia/if_tr_pcmcia.c b/sys/dev/pcmcia/if_tr_pcmcia.c
index fbc27759833..c270ecc5fbd 100644
--- a/sys/dev/pcmcia/if_tr_pcmcia.c
+++ b/sys/dev/pcmcia/if_tr_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.6 2001/12/15 11:45:24 soren Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.7 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.6 2001/12/15 11:45:24 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.7 2001/12/15 13:23:22 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,7 @@ tr_pcmcia_attach(parent, self, aux)
struct tr_softc *sc = &psc->sc_tr;
struct pcmcia_attach_args *pa = aux;
struct pcmcia_config_entry *cfe;
- bus_addr_t offset;
+ bus_size_t offset;
psc->sc_pf = pa->pf;
cfe = pa->pf->cfe_head.sqh_first;
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 071f7f3cf58..6346c438207 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.27 2001/11/15 09:48:12 lukem Exp $ */
+/* $NetBSD: pcmcia.c,v 1.28 2001/12/15 13:23:22 soren Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.27 2001/11/15 09:48:12 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.28 2001/12/15 13:23:22 soren Exp $");
#include "opt_pcmciaverbose.h"
@@ -38,7 +38,6 @@ __KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.27 2001/11/15 09:48:12 lukem Exp $");
#include <sys/systm.h>
#include <sys/device.h>
-
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciachip.h>
#include <dev/pcmcia/pcmciavar.h>
diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h
index 189c014614e..c97e18fdefc 100644
--- a/sys/dev/pcmcia/pcmciachip.h
+++ b/sys/dev/pcmcia/pcmciachip.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciachip.h,v 1.5 2000/01/13 08:58:51 joda Exp $ */
+/* $NetBSD: pcmciachip.h,v 1.6 2001/12/15 13:23:23 soren Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -66,7 +66,7 @@ struct pcmcia_chip_functions {
/* memory space window mapping */
int (*mem_map) __P((pcmcia_chipset_handle_t, int, bus_addr_t,
bus_size_t, struct pcmcia_mem_handle *,
- bus_addr_t *, int *));
+ bus_size_t *, int *));
void (*mem_unmap) __P((pcmcia_chipset_handle_t, int));
/* I/O space allocation */
diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h
index 6ee0300577e..f49a99dbace 100644
--- a/sys/dev/pcmcia/pcmciavar.h
+++ b/sys/dev/pcmcia/pcmciavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciavar.h,v 1.14 2001/01/18 20:28:26 jdolecek Exp $ */
+/* $NetBSD: pcmciavar.h,v 1.15 2001/12/15 13:23:23 soren Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -32,8 +32,6 @@
#include <sys/types.h>
#include <sys/queue.h>
-#include <machine/bus.h>
-
#include <dev/pcmcia/pcmciachip.h>
extern int pcmcia_verbose;
@@ -139,7 +137,7 @@ struct pcmcia_function {
#define pf_ccrh pf_pcmh.memh
#define pf_ccr_mhandle pf_pcmh.mhandle
#define pf_ccr_realsize pf_pcmh.realsize
- bus_addr_t pf_ccr_offset;
+ bus_size_t pf_ccr_offset;
int pf_ccr_window;
long pf_mfc_iobase;
long pf_mfc_iomax;
@@ -218,7 +216,7 @@ struct pcmcia_tuple {
unsigned int code;
unsigned int length;
u_long mult;
- bus_addr_t ptr;
+ bus_size_t ptr;
bus_space_tag_t memt;
bus_space_handle_t memh;
};
diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c
index 30c289d75f2..eaf81c68b84 100644
--- a/sys/dev/sbus/stp4020.c
+++ b/sys/dev/sbus/stp4020.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020.c,v 1.13 2001/11/15 09:48:15 lukem Exp $ */
+/* $NetBSD: stp4020.c,v 1.14 2001/12/15 13:23:23 soren Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.13 2001/11/15 09:48:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stp4020.c,v 1.14 2001/12/15 13:23:23 soren Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,7 +152,7 @@ void stp4020_chip_mem_free __P((pcmcia_chipset_handle_t,
struct pcmcia_mem_handle *));
int stp4020_chip_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t,
bus_size_t, struct pcmcia_mem_handle *,
- bus_addr_t *, int *));
+ bus_size_t *, int *));
void stp4020_chip_mem_unmap __P((pcmcia_chipset_handle_t, int));
int stp4020_chip_io_alloc __P((pcmcia_chipset_handle_t,
@@ -664,7 +664,7 @@ stp4020_chip_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
bus_addr_t card_addr;
bus_size_t size;
struct pcmcia_mem_handle *pcmhp;
- bus_addr_t *offsetp;
+ bus_size_t *offsetp;
int *windowp;
{
struct stp4020_socket *h = (struct stp4020_socket *)pch;