summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev/hdfd.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
committerchristos <christos@NetBSD.org>2007-03-04 05:59:00 +0000
commit53524e44efd7c7176da8dc8190a698b2fe184db1 (patch)
tree68b6fb4aee85c3eb0a522cc199c3a3427938828e /sys/arch/atari/dev/hdfd.c
parent1b20cebad5f8d3582a41d5599641a95247721732 (diff)
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/arch/atari/dev/hdfd.c')
-rw-r--r--sys/arch/atari/dev/hdfd.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index fbc7e1f6b34..0ad41392c2d 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.52 2007/02/15 18:33:26 reinoud Exp $ */
+/* $NetBSD: hdfd.c,v 1.53 2007/03/04 05:59:40 christos Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.52 2007/02/15 18:33:26 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.53 2007/03/04 05:59:40 christos Exp $");
#include "opt_ddb.h"
@@ -148,7 +148,7 @@ volatile u_char *fdio_addr;
* Interface to the pseudo-DMA handler
*/
void fddma_intr(void);
-caddr_t fddmaaddr = NULL;
+void * fddmaaddr = NULL;
int fddmalen = 0;
extern void mfp_hdfd_nf __P((void)), mfp_hdfd_fifo __P((void));
@@ -340,7 +340,7 @@ fdcprobe(parent, cfp, aux)
return 0;
if (bus_space_map(mb_tag, FD_IOBASE, FD_IOSIZE, 0,
- (caddr_t*)(void *)&fdio_addr)) {
+ (void **)(void *)&fdio_addr)) {
printf("fdcprobe: cannot map io-area\n");
mb_free_bus_space_tag(mb_tag);
return (0);
@@ -365,7 +365,7 @@ fdcprobe(parent, cfp, aux)
out:
if (fdc_matched == 0) {
- bus_space_unmap(mb_tag, (caddr_t)__UNVOLATILE(fdio_addr),
+ bus_space_unmap(mb_tag, (void *)__UNVOLATILE(fdio_addr),
FD_IOSIZE);
mb_free_bus_space_tag(mb_tag);
}
@@ -1335,7 +1335,7 @@ int
fdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
- caddr_t addr;
+ void *addr;
int flag;
struct lwp *l;
{
@@ -1551,7 +1551,7 @@ fdformat(dev, finfo, p)
+ finfo->head * type->sectrac) * FDC_BSIZE / DEV_BSIZE;
bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs;
- bp->b_data = (caddr_t)finfo;
+ bp->b_data = (void *)finfo;
#ifdef DEBUG
printf("fdformat: blkno %x count %lx\n", bp->b_blkno, bp->b_bcount);
@@ -1563,7 +1563,7 @@ fdformat(dev, finfo, p)
/* ...and wait for it to complete */
s = splbio();
while(!(bp->b_flags & B_DONE)) {
- rv = tsleep((caddr_t)bp, PRIBIO, "fdform", 20 * hz);
+ rv = tsleep((void *)bp, PRIBIO, "fdform", 20 * hz);
if (rv == EWOULDBLOCK)
break;
}