diff options
| author | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2007-03-04 05:59:00 +0000 |
| commit | 53524e44efd7c7176da8dc8190a698b2fe184db1 (patch) | |
| tree | 68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/dev/mca | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/dev/mca')
| -rw-r--r-- | sys/dev/mca/ed_mca.c | 10 | ||||
| -rw-r--r-- | sys/dev/mca/esp_mca.c | 8 | ||||
| -rw-r--r-- | sys/dev/mca/espvar.h | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c index f1f44d52dfa..c380d71ce0c 100644 --- a/sys/dev/mca/ed_mca.c +++ b/sys/dev/mca/ed_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: ed_mca.c,v 1.34 2006/11/16 01:33:05 christos Exp $ */ +/* $NetBSD: ed_mca.c,v 1.35 2007/03/04 06:02:14 christos Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.34 2006/11/16 01:33:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.35 2007/03/04 06:02:14 christos Exp $"); #include "rnd.h" @@ -477,7 +477,7 @@ int edmcaioctl(dev, xfer, addr, flag, l) dev_t dev; u_long xfer; - caddr_t addr; + void *addr; int flag; struct lwp *l; { @@ -663,7 +663,7 @@ int edmcadump(dev, blkno, va, size) dev_t dev; daddr_t blkno; - caddr_t va; + void *va; size_t size; { struct ed_softc *ed; /* disk unit to do the I/O */ @@ -719,7 +719,7 @@ edmcadump(dev, blkno, va, size) /* update block count */ nblks -= min(nblks, eddumpmulti); blkno += min(nblks, eddumpmulti); - va += min(nblks, eddumpmulti) * lp->d_secsize; + va = (char *)va + min(nblks, eddumpmulti) * lp->d_secsize; } eddoingadump = 0; diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c index 7e2229fd15e..a3c0f788b96 100644 --- a/sys/dev/mca/esp_mca.c +++ b/sys/dev/mca/esp_mca.c @@ -1,4 +1,4 @@ -/* $NetBSD: esp_mca.c,v 1.14 2006/11/16 01:33:05 christos Exp $ */ +/* $NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.14 2006/11/16 01:33:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.15 2007/03/04 06:02:14 christos Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -107,7 +107,7 @@ static void esp_write_reg(struct ncr53c9x_softc *, int, u_char); static int esp_dma_isintr(struct ncr53c9x_softc *); static void esp_dma_reset(struct ncr53c9x_softc *); static int esp_dma_intr(struct ncr53c9x_softc *); -static int esp_dma_setup(struct ncr53c9x_softc *, caddr_t *, +static int esp_dma_setup(struct ncr53c9x_softc *, void **, size_t *, int, size_t *); static void esp_dma_go(struct ncr53c9x_softc *); static void esp_dma_stop(struct ncr53c9x_softc *); @@ -374,7 +374,7 @@ esp_dma_intr(sc) static int esp_dma_setup( struct ncr53c9x_softc *sc, - caddr_t *addr, + void **addr, size_t *len, int datain, size_t *dmasize diff --git a/sys/dev/mca/espvar.h b/sys/dev/mca/espvar.h index 6f2be003c78..6f6f5b69701 100644 --- a/sys/dev/mca/espvar.h +++ b/sys/dev/mca/espvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: espvar.h,v 1.2 2001/12/04 20:47:58 jdolecek Exp $ */ +/* $NetBSD: espvar.h,v 1.3 2007/03/04 06:02:14 christos Exp $ */ /*- * Copyright (c) 1997, 2001 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ struct esp_softc { bus_dmamap_t sc_xfer; - caddr_t *sc_xfer_addr; + void * *sc_xfer_addr; size_t *sc_xfer_len; volatile int sc_flags; |
