summaryrefslogtreecommitdiff
path: root/sys/arch/atari/include
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/include
parent1b20cebad5f8d3582a41d5599641a95247721732 (diff)
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/arch/atari/include')
-rw-r--r--sys/arch/atari/include/bus.h8
-rw-r--r--sys/arch/atari/include/cpu.h18
-rw-r--r--sys/arch/atari/include/dma.h4
-rw-r--r--sys/arch/atari/include/pcb.h4
4 files changed, 17 insertions, 17 deletions
diff --git a/sys/arch/atari/include/bus.h b/sys/arch/atari/include/bus.h
index 3df78426f9e..761d3b433ef 100644
--- a/sys/arch/atari/include/bus.h
+++ b/sys/arch/atari/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.34 2007/02/21 20:41:23 mrg Exp $ */
+/* $NetBSD: bus.h,v 1.35 2007/03/04 05:59:41 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@ typedef u_long bus_size_t;
* Access methods for bus resources and address space.
*/
typedef struct atari_bus_space *bus_space_tag_t;
-typedef caddr_t bus_space_handle_t;
+typedef void * bus_space_handle_t;
#define BUS_SPACE_MAP_CACHEABLE 0x01
#define BUS_SPACE_MAP_LINEAR 0x02
@@ -706,8 +706,8 @@ int bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
void bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs));
int bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, caddr_t *kvap, int flags));
-void bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
+ int nsegs, size_t size, void **kvap, int flags));
+void bus_dmamem_unmap __P((bus_dma_tag_t tag, void *kva,
size_t size));
paddr_t bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
int nsegs, off_t off, int prot, int flags));
diff --git a/sys/arch/atari/include/cpu.h b/sys/arch/atari/include/cpu.h
index 99faffe1867..5bb1fe9116f 100644
--- a/sys/arch/atari/include/cpu.h
+++ b/sys/arch/atari/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.50 2007/02/16 02:53:44 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.51 2007/03/04 05:59:41 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -214,7 +214,7 @@ extern int machineid;
/*
* Prototypes from atari_init.c
*/
-int cpu_dump __P((int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t *));
+int cpu_dump __P((int (*)(dev_t, daddr_t, void *, size_t), daddr_t *));
int cpu_dumpsize __P((void));
/*
@@ -236,13 +236,13 @@ int fpu_probe __P((void));
/*
* Prototypes from vm_machdep.c
*/
-int badbaddr __P((caddr_t, int));
+int badbaddr __P((void *, int));
void consinit __P((void));
void dumpconf __P((void));
-int kvtop __P((caddr_t));
-void physaccess __P((caddr_t, caddr_t, int, int));
-void physunaccess __P((caddr_t, int));
-void setredzone __P((u_int *, caddr_t));
+int kvtop __P((void *));
+void physaccess __P((void *, void *, int, int));
+void physunaccess __P((void *, int));
+void setredzone __P((u_int *, void *));
/*
* Prototypes from locore.s
@@ -260,7 +260,7 @@ void physcopyseg __P((paddr_t, paddr_t));
u_int probeva __P((u_int, u_int));
void proc_trampoline __P((void));
void savectx __P((struct pcb *));
-int suline __P((caddr_t, caddr_t));
+int suline __P((void *, void *));
void switch_exit __P((struct lwp *));
void switch_lwp_exit __P((struct lwp *));
@@ -285,7 +285,7 @@ int nvram_uio __P((struct uio *));
* Prototypes from sys_machdep.c:
*/
int cachectl1 __P((unsigned long, vaddr_t, size_t, struct proc *));
-int dma_cachectl __P((caddr_t, int));
+int dma_cachectl __P((void *, int));
/*
* Prototypes from pci_machdep.c
diff --git a/sys/arch/atari/include/dma.h b/sys/arch/atari/include/dma.h
index 822fd1d8223..0ff3de44742 100644
--- a/sys/arch/atari/include/dma.h
+++ b/sys/arch/atari/include/dma.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.h,v 1.8 1996/02/22 10:11:41 leo Exp $ */
+/* $NetBSD: dma.h,v 1.9 2007/03/04 05:59:41 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -99,7 +99,7 @@ typedef void (*dma_farg)(void*);
int st_dmagrab __P((dma_farg, dma_farg, void *, int *, int));
void st_dmafree __P((void *, int *));
int st_dmawanted __P((void));
-void st_dmaaddr_set __P((caddr_t));
+void st_dmaaddr_set __P((void *));
u_long st_dmaaddr_get __P((void));
void st_dmacomm __P((int, int));
#endif /* _KERNEL */
diff --git a/sys/arch/atari/include/pcb.h b/sys/arch/atari/include/pcb.h
index f98db7b421d..093e5b66001 100644
--- a/sys/arch/atari/include/pcb.h
+++ b/sys/arch/atari/include/pcb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.6 2005/12/11 12:16:59 christos Exp $ */
+/* $NetBSD: pcb.h,v 1.7 2007/03/04 05:59:41 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -92,7 +92,7 @@ struct pcb
int pcb_usp; /* user stack pointer (+8) */
int pcb_regs[12]; /* D2-D7, A2-A7 (+C) */
int pcb_cmap2; /* temporary copy PTE */
- caddr_t pcb_onfault; /* for copyin/out faults */
+ void * pcb_onfault; /* for copyin/out faults */
struct fpframe pcb_fpregs; /* 68881/2 context save area */
int pcb_exec[16]; /* exec structure for core dumps */
};