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/arch/atari/dev | |
| parent | 1b20cebad5f8d3582a41d5599641a95247721732 (diff) | |
Kill caddr_t; there will be some MI fallout, but it will be fixed shortly.
Diffstat (limited to 'sys/arch/atari/dev')
| -rw-r--r-- | sys/arch/atari/dev/atari5380.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/clock.c | 10 | ||||
| -rw-r--r-- | sys/arch/atari/dev/dma.c | 8 | ||||
| -rw-r--r-- | sys/arch/atari/dev/event.c | 12 | ||||
| -rw-r--r-- | sys/arch/atari/dev/event_var.h | 4 | ||||
| -rw-r--r-- | sys/arch/atari/dev/fd.c | 20 | ||||
| -rw-r--r-- | sys/arch/atari/dev/grf.c | 16 | ||||
| -rw-r--r-- | sys/arch/atari/dev/grf_etreg.h | 10 | ||||
| -rw-r--r-- | sys/arch/atari/dev/grfabs_et.c | 20 | ||||
| -rw-r--r-- | sys/arch/atari/dev/grfioctl.h | 8 | ||||
| -rw-r--r-- | sys/arch/atari/dev/grfvar.h | 4 | ||||
| -rw-r--r-- | sys/arch/atari/dev/hdfd.c | 16 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite.c | 8 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite_cc.c | 12 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ite_et.c | 12 | ||||
| -rw-r--r-- | sys/arch/atari/dev/itevar.h | 4 | ||||
| -rw-r--r-- | sys/arch/atari/dev/kbd.c | 18 | ||||
| -rw-r--r-- | sys/arch/atari/dev/lpt.c | 14 | ||||
| -rw-r--r-- | sys/arch/atari/dev/md_root.c | 20 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ms.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ncr5380.c | 8 | ||||
| -rw-r--r-- | sys/arch/atari/dev/ser.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/view.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/dev/zs.c | 18 | ||||
| -rw-r--r-- | sys/arch/atari/dev/zsvar.h | 4 |
25 files changed, 135 insertions, 135 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c index 57b332053bf..ddd21226370 100644 --- a/sys/arch/atari/dev/atari5380.c +++ b/sys/arch/atari/dev/atari5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: atari5380.c,v 1.41 2006/05/10 06:24:02 skrll Exp $ */ +/* $NetBSD: atari5380.c,v 1.42 2007/03/04 05:59:39 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.41 2006/05/10 06:24:02 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.42 2007/03/04 05:59:39 christos Exp $"); #include "opt_atariscsi.h" @@ -826,7 +826,7 @@ u_int dir, nsects; SC_REQ *reqp; { dir <<= 8; - st_dmaaddr_set((caddr_t)reqp->dm_cur->dm_addr); + st_dmaaddr_set((void *)reqp->dm_cur->dm_addr); DMA->dma_mode = 0x90 | dir; DMA->dma_mode = 0x90 | (dir ^ DMA_WRBIT); DMA->dma_mode = 0x90 | dir; diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c index fd54d89dbf4..f13e504d50c 100644 --- a/sys/arch/atari/dev/clock.c +++ b/sys/arch/atari/dev/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.37 2005/12/24 20:06:58 perry Exp $ */ +/* $NetBSD: clock.c,v 1.38 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.37 2005/12/24 20:06:58 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.38 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -376,7 +376,7 @@ int n; * Assumes it is called with clock interrupts blocked. */ profclock(pc, ps) - caddr_t pc; + void *pc; int ps; { /* @@ -564,7 +564,7 @@ rtcread(dev, uio, flags) if (length > uio->uio_resid) length = uio->uio_resid; - return(uiomove((caddr_t)buffer, length, uio)); + return(uiomove((void *)buffer, length, uio)); } static int @@ -599,7 +599,7 @@ rtcwrite(dev, uio, flags) && length != sizeof(buffer - 1))) return(EINVAL); - if ((error = uiomove((caddr_t)buffer, sizeof(buffer), uio))) + if ((error = uiomove((void *)buffer, sizeof(buffer), uio))) return(error); if (length == sizeof(buffer) && buffer[sizeof(buffer) - 1] != '\n') diff --git a/sys/arch/atari/dev/dma.c b/sys/arch/atari/dev/dma.c index b11724eff32..0a94ca84d84 100644 --- a/sys/arch/atari/dev/dma.c +++ b/sys/arch/atari/dev/dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: dma.c,v 1.17 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.17 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -198,7 +198,7 @@ int *lock_stat; *req->lock_stat = DMA_LOCK_GRANT; if (req->call_func == NULL) - wakeup((caddr_t)&dma_active); + wakeup((void *)&dma_active); else { /* * Call next request through softint handler. This avoids @@ -251,7 +251,7 @@ int sr; /* sr at time of interrupt */ */ void st_dmaaddr_set(address) -caddr_t address; +void * address; { register u_long ad = (u_long)address; diff --git a/sys/arch/atari/dev/event.c b/sys/arch/atari/dev/event.c index 63f1fc35fe2..fa1744b7677 100644 --- a/sys/arch/atari/dev/event.c +++ b/sys/arch/atari/dev/event.c @@ -1,4 +1,4 @@ -/* $NetBSD: event.c,v 1.10 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: event.c,v 1.11 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.10 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.11 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/fcntl.h> @@ -72,7 +72,7 @@ ev_init(ev) ev->ev_get = ev->ev_put = 0; ev->ev_q = malloc((u_long)EV_QSIZE * sizeof(struct firm_event), M_DEVBUF, M_WAITOK); - bzero((caddr_t)ev->ev_q, EV_QSIZE * sizeof(struct firm_event)); + bzero((void *)ev->ev_q, EV_QSIZE * sizeof(struct firm_event)); } /* @@ -110,7 +110,7 @@ ev_read(ev, uio, flags) return (EWOULDBLOCK); } ev->ev_wanted = 1; - error = tsleep((caddr_t)ev, PEVENT | PCATCH, "firm_event", 0); + error = tsleep((void *)ev, PEVENT | PCATCH, "firm_event", 0); if (error) { splx(s); return (error); @@ -128,7 +128,7 @@ ev_read(ev, uio, flags) n = howmany(uio->uio_resid, sizeof(struct firm_event)); if (cnt > n) cnt = n; - error = uiomove((caddr_t)&ev->ev_q[ev->ev_get], + error = uiomove((void *)&ev->ev_q[ev->ev_get], cnt * sizeof(struct firm_event), uio); n -= cnt; /* @@ -141,7 +141,7 @@ ev_read(ev, uio, flags) return (error); if (cnt > n) cnt = n; - error = uiomove((caddr_t)&ev->ev_q[0], + error = uiomove((void *)&ev->ev_q[0], cnt * sizeof(struct firm_event), uio); ev->ev_get = cnt; return (error); diff --git a/sys/arch/atari/dev/event_var.h b/sys/arch/atari/dev/event_var.h index 7d1b4457b67..6b24d2dd19c 100644 --- a/sys/arch/atari/dev/event_var.h +++ b/sys/arch/atari/dev/event_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: event_var.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: event_var.h,v 1.6 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -67,7 +67,7 @@ struct evvar { selnotify(&(ev)->ev_sel, 0); \ if ((ev)->ev_wanted) { \ (ev)->ev_wanted = 0; \ - wakeup((caddr_t)(ev)); \ + wakeup((void *)(ev)); \ } \ if ((ev)->ev_async) \ psignal((ev)->ev_io, SIGIO); \ diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c index df113e4ae04..fc5e0fbaea1 100644 --- a/sys/arch/atari/dev/fd.c +++ b/sys/arch/atari/dev/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.53 2005/12/24 23:23:59 perry Exp $ */ +/* $NetBSD: fd.c,v 1.54 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.53 2005/12/24 23:23:59 perry Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.54 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -147,7 +147,7 @@ struct fd_softc { short flags; /* misc flags */ short part; /* Current open partition */ int sector; /* logical sector for I/O */ - caddr_t io_data; /* KVA for data transfer */ + void * io_data; /* KVA for data transfer */ int io_bytes; /* bytes left for I/O */ int io_dir; /* B_READ/B_WRITE */ int errcnt; /* current error count */ @@ -416,7 +416,7 @@ fdioctl(dev, cmd, addr, flag, l) dev_t dev; u_long cmd; int flag; -caddr_t addr; +void * addr; struct lwp *l; { struct fd_softc *sc; @@ -500,7 +500,7 @@ struct lwp *l; */ sps = splbio(); while(sc->flags & FLPF_INOPEN) - tsleep((caddr_t)sc, PRIBIO, "fdopen", 0); + tsleep((void *)sc, PRIBIO, "fdopen", 0); splx(sps); if(!(sc->flags & FLPF_ISOPEN)) { @@ -534,9 +534,9 @@ struct lwp *l; st_dmagrab((dma_farg)fdcint, (dma_farg)fdstatus, sc, &lock_stat, 0); while(sc->flags & FLPF_GETSTAT) - tsleep((caddr_t)sc, PRIBIO, "fdopen", 0); + tsleep((void *)sc, PRIBIO, "fdopen", 0); splx(sps); - wakeup((caddr_t)sc); + wakeup((void *)sc); if((sc->flags & FLPF_WRTPROT) && (flags & FWRITE)) { sc->flags = 0; @@ -934,7 +934,7 @@ struct fd_softc *sc; bcopy(sc->io_data, sc->bounceb, SECTOR_SIZE); sc->flags |= FLPF_BOUNCE; } - st_dmaaddr_set((caddr_t)phys_addr); /* DMA address setup */ + st_dmaaddr_set((void *)phys_addr); /* DMA address setup */ #ifdef FLP_DEBUG printf("fd_xfer:Start io (io_addr:%lx)\n", (u_long)kvtop(sc->io_data)); @@ -1001,7 +1001,7 @@ struct fd_softc *sc; if(fd_state == FLP_STAT) { sc->flags |= FLPF_EMPTY; sc->flags &= ~FLPF_GETSTAT; - wakeup((caddr_t)sc); + wakeup((void *)sc); fddone(sc); return; } @@ -1028,7 +1028,7 @@ struct fd_softc *sc; if(fd_state == FLP_STAT) { sc->flags &= ~FLPF_GETSTAT; - wakeup((caddr_t)sc); + wakeup((void *)sc); fddone(sc); return; } diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c index 42444eb0dd5..20bc515c27f 100644 --- a/sys/arch/atari/dev/grf.c +++ b/sys/arch/atari/dev/grf.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.35 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -85,7 +85,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.35 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -246,7 +246,7 @@ grfioctl(dev, cmd, data, flag, l) dev_t dev; u_long cmd; int flag; -caddr_t data; +void * data; struct lwp *l; { struct grf_softc *gp; @@ -259,10 +259,10 @@ struct lwp *l; switch (cmd) { case OGRFIOCGINFO: /* argl.. no bank-member.. */ - bcopy((caddr_t)&gp->g_display, data, sizeof(struct grfinfo)-4); + bcopy((void *)&gp->g_display, data, sizeof(struct grfinfo)-4); break; case GRFIOCGINFO: - bcopy((caddr_t)&gp->g_display, data, sizeof(struct grfinfo)); + bcopy((void *)&gp->g_display, data, sizeof(struct grfinfo)); break; case GRFIOCON: error = grfon(dev); @@ -424,10 +424,10 @@ struct grf_softc *gp; gi = &gp->g_display; - (*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGBMAP, (caddr_t)&bm, + (*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGBMAP, (void *)&bm, 0, NOLWP); - gp->g_data = (caddr_t) 0xDeadBeaf; /* not particularly clean.. */ + gp->g_data = (void *) 0xDeadBeaf; /* not particularly clean.. */ gi->gd_fbaddr = bm.hw_address; gi->gd_fbsize = bm.phys_mappable; @@ -438,7 +438,7 @@ struct grf_softc *gp; gi->gd_vgasize = bm.vga_mappable; gi->gd_vgabase = bm.vga_base; - if((*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGSIZE, (caddr_t)&vs, 0, + if((*view_cdevsw.d_ioctl)(gp->g_viewdev, VIOCGSIZE, (void *)&vs, 0, NOLWP)) { /* * fill in some default values... diff --git a/sys/arch/atari/dev/grf_etreg.h b/sys/arch/atari/dev/grf_etreg.h index 12164929c17..88a38e991ad 100644 --- a/sys/arch/atari/dev/grf_etreg.h +++ b/sys/arch/atari/dev/grf_etreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: grf_etreg.h,v 1.1 1996/10/04 07:27:53 leo Exp $ */ +/* $NetBSD: grf_etreg.h,v 1.2 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1996 Tobias Abt @@ -215,24 +215,24 @@ vgaw(ba, ACT_ADDRESS_W, val); \ } while (0) -static inline u_char RAttr(volatile void * ba, short idx) { +static inline u_char RAttr(volatile void *ba, short idx) { if(vgar(ba, GREG_STATUS1_R)) ; vgaw(ba, ACT_ADDRESS_W, idx); return vgar(ba, ACT_ADDRESS_R); } -static inline u_char RSeq(volatile void * ba, short idx) { +static inline u_char RSeq(volatile void *ba, short idx) { vgaw(ba, SEQ_ADDRESS, idx); return vgar(ba, SEQ_ADDRESS_R); } -static inline u_char RCrt(volatile void * ba, short idx) { +static inline u_char RCrt(volatile void *ba, short idx) { vgaw(ba, CRT_ADDRESS, idx); return vgar(ba, CRT_ADDRESS_R); } -static inline u_char RGfx(volatile void * ba, short idx) { +static inline u_char RGfx(volatile void *ba, short idx) { vgaw(ba, GCT_ADDRESS, idx); return vgar(ba, GCT_ADDRESS_R); } diff --git a/sys/arch/atari/dev/grfabs_et.c b/sys/arch/atari/dev/grfabs_et.c index cbee74c521e..2c8b3a09d64 100644 --- a/sys/arch/atari/dev/grfabs_et.c +++ b/sys/arch/atari/dev/grfabs_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_et.c,v 1.25 2006/03/29 18:05:57 thomas Exp $ */ +/* $NetBSD: grfabs_et.c,v 1.26 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.25 2006/03/29 18:05:57 thomas Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.26 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -154,8 +154,8 @@ static bmap_t con_bm; /* XXX */ struct grfabs_et_priv { pcitag_t pci_tag; - volatile caddr_t regkva; - volatile caddr_t memkva; + volatile void * regkva; + volatile void * memkva; u_int linbase; int regsz; int memsz; @@ -334,12 +334,12 @@ u_char depth; * Initialize the bitmap */ bm->plane = et_priv.memkva; - bm->vga_address = (caddr_t)kvtop(et_priv.memkva); + bm->vga_address = (void *)kvtop(et_priv.memkva); bm->vga_base = VGA_BASE; - bm->hw_address = (caddr_t)(PCI_MEM_PHYS | et_priv.linbase); + bm->hw_address = (void *)(PCI_MEM_PHYS | et_priv.linbase); bm->lin_base = et_priv.linbase; bm->regs = et_priv.regkva; - bm->hw_regs = (caddr_t)kvtop(et_priv.regkva); + bm->hw_regs = (void *)kvtop(et_priv.regkva); bm->reg_size = REG_MAPPABLE; bm->phys_mappable = FRAME_MAPPABLE; bm->vga_mappable = VGA_MAPPABLE; @@ -457,7 +457,7 @@ et_probe_card() #ifdef ET4000_HAS_2MB_MEM /* set KEY to access the tseng private registers */ - ba = (volatile caddr_t)pci_io_addr; + ba = (volatile void *)pci_io_addr; vgaw(ba, GREG_HERCULESCOMPAT, 0x03); vgaw(ba, GREG_DISPMODECONTROL, 0xa0); @@ -472,8 +472,8 @@ et_probe_card() /* * The things below are setup in atari_init.c */ - et_priv.regkva = (volatile caddr_t)pci_io_addr; - et_priv.memkva = (volatile caddr_t)pci_mem_addr; + et_priv.regkva = (volatile void *)pci_io_addr; + et_priv.memkva = (volatile void *)pci_mem_addr; et_priv.linbase = PCI_LINMEMBASE; /* XXX pci_conf_read??? */ et_priv.memsz = PCI_VGA_SIZE; et_priv.regsz = PCI_IO_SIZE; diff --git a/sys/arch/atari/dev/grfioctl.h b/sys/arch/atari/dev/grfioctl.h index 6ace68c61d4..686beda09fe 100644 --- a/sys/arch/atari/dev/grfioctl.h +++ b/sys/arch/atari/dev/grfioctl.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfioctl.h,v 1.7 2006/11/24 22:04:21 wiz Exp $ */ +/* $NetBSD: grfioctl.h,v 1.8 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -91,12 +91,12 @@ struct grfdyninfo { }; struct grfinfo { - caddr_t gd_fbaddr; /* frame buffer linear physaddr */ + void * gd_fbaddr; /* frame buffer linear physaddr */ int gd_fbsize; /* frame buffer linear size */ int gd_linbase; /* frame buffer linear base */ - caddr_t gd_regaddr; /* register area physaddr */ + void * gd_regaddr; /* register area physaddr */ int gd_regsize; /* register area size */ - caddr_t gd_vgaaddr; /* vga area physaddr */ + void *gd_vgaaddr; /* vga area physaddr */ int gd_vgasize; /* vga area size */ int gd_vgabase; /* vga area base */ short gd_colors; /* number of colors */ diff --git a/sys/arch/atari/dev/grfvar.h b/sys/arch/atari/dev/grfvar.h index b6211d37734..b3e03540698 100644 --- a/sys/arch/atari/dev/grfvar.h +++ b/sys/arch/atari/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfvar.h,v 1.9 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: grfvar.h,v 1.10 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -100,7 +100,7 @@ struct grf_softc { dev_t g_itedev; /* ite device number */ dev_t g_grfdev; /* grf device number */ dev_t g_viewdev; /* view device number */ - caddr_t g_data; /* device dependent data */ + void * g_data; /* device dependent data */ int (*g_mode) __P((struct grf_softc *, int, void *, int, int)); int g_conpri; /* priority of ite as console */ 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; } diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c index 82b36102dad..a3d4a69cff8 100644 --- a/sys/arch/atari/dev/ite.c +++ b/sys/arch/atari/dev/ite.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.53 2006/10/01 18:56:21 elad Exp $ */ +/* $NetBSD: ite.c,v 1.54 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.53 2006/10/01 18:56:21 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.54 2007/03/04 05:59:40 christos Exp $"); #include "opt_ddb.h" @@ -559,7 +559,7 @@ iteioctl(dev, cmd, addr, flag, l) dev_t dev; u_long cmd; int flag; - caddr_t addr; + void * addr; struct lwp *l; { struct iterepeat *irp; @@ -685,7 +685,7 @@ itestart(tp) if (rbp->c_cc <= tp->t_lowat) { if (tp->t_state & TS_ASLEEP) { tp->t_state &= ~TS_ASLEEP; - wakeup((caddr_t) rbp); + wakeup((void *) rbp); } selwakeup(&tp->t_wsel); } diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c index 188794515b8..c4390d6de36 100644 --- a/sys/arch/atari/dev/ite_cc.c +++ b/sys/arch/atari/dev/ite_cc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite_cc.c,v 1.26 2006/03/26 04:44:08 thorpej Exp $ */ +/* $NetBSD: ite_cc.c,v 1.27 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.26 2006/03/26 04:44:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.27 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -92,7 +92,7 @@ extern font_info font_info_8x16; static void view_init __P((struct ite_softc *)); static void view_deinit __P((struct ite_softc *)); -static int itecc_ioctl __P((struct ite_softc *, u_long, caddr_t, int, +static int itecc_ioctl __P((struct ite_softc *, u_long, void *, int, struct lwp *)); static int ite_newsize __P((struct ite_softc *, struct itewinsize *)); static void cursor32 __P((struct ite_softc *, int)); @@ -389,7 +389,7 @@ struct itewinsize *winsz; vs.depth = winsz->depth; error = (*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, VIOCSSIZE, - (caddr_t)&vs, 0, NOLWP); + (void *)&vs, 0, NOLWP); view = viewview(ip->grf->g_viewdev); /* @@ -460,7 +460,7 @@ int itecc_ioctl(ip, cmd, addr, flag, l) struct ite_softc *ip; u_long cmd; -caddr_t addr; +void * addr; int flag; struct lwp *l; { @@ -489,7 +489,7 @@ struct lwp *l; * XXX this is messy, but works */ (*ite_cdevsw.d_ioctl)(ip->grf->g_itedev, TIOCSWINSZ, - (caddr_t)&ws, 0, l); + (void *)&ws, 0, l); } break; case VIOCSCMAP: diff --git a/sys/arch/atari/dev/ite_et.c b/sys/arch/atari/dev/ite_et.c index 63d4630cc39..1fd39ca6709 100644 --- a/sys/arch/atari/dev/ite_et.c +++ b/sys/arch/atari/dev/ite_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite_et.c,v 1.19 2006/03/26 04:44:08 thorpej Exp $ */ +/* $NetBSD: ite_et.c,v 1.20 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.19 2006/03/26 04:44:08 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.20 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -82,7 +82,7 @@ extern font_info font_info_8x16; static void grfet_iteinit __P((struct grf_softc *)); static void view_init __P((struct ite_softc *)); static void view_deinit __P((struct ite_softc *)); -static int iteet_ioctl __P((struct ite_softc *, u_long, caddr_t, int, +static int iteet_ioctl __P((struct ite_softc *, u_long, void *, int, struct lwp *)); static int ite_newsize __P((struct ite_softc *, struct itewinsize *)); static void et_inittextmode __P((struct ite_softc *, et_sv_reg_t *, int)); @@ -369,7 +369,7 @@ struct itewinsize *winsz; vs.depth = winsz->depth; error = (*view_cdevsw.d_ioctl)(ip->grf->g_viewdev, VIOCSSIZE, - (caddr_t)&vs, 0, NOLWP); + (void *)&vs, 0, NOLWP); view = viewview(ip->grf->g_viewdev); /* @@ -404,7 +404,7 @@ int iteet_ioctl(ip, cmd, addr, flag, l) struct ite_softc *ip; u_long cmd; -caddr_t addr; +void * addr; int flag; struct lwp *l; { @@ -433,7 +433,7 @@ struct lwp *l; * XXX this is messy, but works */ (*ite_cdevsw.d_ioctl)(ip->grf->g_itedev, TIOCSWINSZ, - (caddr_t)&ws, 0, l); + (void *)&ws, 0, l); } break; case VIOCSCMAP: diff --git a/sys/arch/atari/dev/itevar.h b/sys/arch/atari/dev/itevar.h index de466649948..b8f093f5a0f 100644 --- a/sys/arch/atari/dev/itevar.h +++ b/sys/arch/atari/dev/itevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: itevar.h,v 1.11 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: itevar.h,v 1.12 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman (Atari modifications) @@ -94,7 +94,7 @@ struct ite_softc { int cury; int save_cury; int (*itexx_ioctl) __P((struct ite_softc *, u_long, - caddr_t, int, struct lwp *)); + void *, int, struct lwp *)); }; enum ite_flags { diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c index 0768e9383a3..98db0d8fbee 100644 --- a/sys/arch/atari/dev/kbd.c +++ b/sys/arch/atari/dev/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.29 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: kbd.c,v 1.30 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.29 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.30 2007/03/04 05:59:40 christos Exp $"); #include "mouse.h" #include "ite.h" @@ -138,7 +138,7 @@ const struct cdevsw kbd_cdevsw = { /* accessops */ static int kbd_enable(void *, int); static void kbd_set_leds(void *, int); -static int kbd_ioctl(void *, u_long, caddr_t, int, struct lwp *); +static int kbd_ioctl(void *, u_long, void *, int, struct lwp *); /* console ops */ static void kbd_getc(void *, u_int *, int *); @@ -299,7 +299,7 @@ kbdread(dev_t dev, struct uio *uio, int flags) } int -kbdioctl(dev_t dev,u_long cmd,register caddr_t data,int flag,struct lwp *l) +kbdioctl(dev_t dev,u_long cmd,register void *data,int flag,struct lwp *l) { register struct kbd_softc *k = &kbd_softc; struct kbdbell *kb; @@ -406,7 +406,7 @@ int sr; /* sr at time of interrupt */ KBD->ac_cs = (kbd_softc.k_soft_cs &= ~A_TXINT); kbd_softc.k_sendp = NULL; kbd_softc.k_send_cnt = 0; - wakeup((caddr_t)&kbd_softc.k_send_cnt); + wakeup((void *)&kbd_softc.k_send_cnt); } } @@ -689,7 +689,7 @@ int len; * Make sure any privious write has ended... */ while (k->k_sendp != NULL) - tsleep((caddr_t)&k->k_sendp, TTOPRI, "kbd_write1", 0); + tsleep((void *)&k->k_sendp, TTOPRI, "kbd_write1", 0); /* * If the KBD-acia is not currently busy, send the first @@ -707,14 +707,14 @@ int len; if (len > 0) { k->k_sendp = cmd; k->k_send_cnt = len; - tsleep((caddr_t)&k->k_send_cnt, TTOPRI, "kbd_write2", 0); + tsleep((void *)&k->k_send_cnt, TTOPRI, "kbd_write2", 0); } splx(sps); /* * Wakeup all procs waiting for us. */ - wakeup((caddr_t)&k->k_sendp); + wakeup((void *)&k->k_sendp); } /* @@ -825,7 +825,7 @@ kbd_set_leds(void *c, int leds) } static int -kbd_ioctl(void *c, u_long cmd, caddr_t data, int flag, struct proc *p) +kbd_ioctl(void *c, u_long cmd, void *data, int flag, struct proc *p) { struct wskbd_bell_data *kd; diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c index db7394569be..e2727bbed0c 100644 --- a/sys/arch/atari/dev/lpt.c +++ b/sys/arch/atari/dev/lpt.c @@ -1,4 +1,4 @@ -/* $NetBSD: lpt.c,v 1.24 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: lpt.c,v 1.25 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.24 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.25 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -218,7 +218,7 @@ lpopen(dev, flag, mode, l) } /* wait 1/4 second, give up if we get a signal */ - if ((error = tsleep((caddr_t)sc, LPTPRI | PCATCH, "lptopen", + if ((error = tsleep((void *)sc, LPTPRI | PCATCH, "lptopen", STEP)) != EWOULDBLOCK) { sc->sc_state = 0; return error; @@ -308,7 +308,7 @@ pushbytes(sc) tic = tic + tic + 1; if (tic > TIMEOUT) tic = TIMEOUT; - error = tsleep((caddr_t)sc, + error = tsleep((void *)sc, LPTPRI | PCATCH, "lptpsh", tic); if (error != EWOULDBLOCK) return error; @@ -333,7 +333,7 @@ pushbytes(sc) sc->sc_count); (void) lptpseudointr(sc); } - if ((error = tsleep((caddr_t)sc, LPTPRI | PCATCH, + if ((error = tsleep((void *)sc, LPTPRI | PCATCH, "lptwrite2", 0)) != 0) return error; } @@ -397,7 +397,7 @@ struct lpt_softc *sc; if (sc->sc_count == 0) { /* none, wake up the top half to get more */ - wakeup((caddr_t)sc); + wakeup((void *)sc); } return 1; @@ -429,7 +429,7 @@ int lpioctl(dev, cmd, data, flag, l) dev_t dev; u_long cmd; - caddr_t data; + void * data; int flag; struct lwp *l; { diff --git a/sys/arch/atari/dev/md_root.c b/sys/arch/atari/dev/md_root.c index 6f470701b69..248b1144e63 100644 --- a/sys/arch/atari/dev/md_root.c +++ b/sys/arch/atari/dev/md_root.c @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.20 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.21 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -92,8 +92,8 @@ struct read_info { struct buf *bp; /* buffer for strategy function */ long nbytes; /* total number of bytes to read */ long offset; /* offset in input medium */ - caddr_t bufp; /* current output buffer */ - caddr_t ebufp; /* absolute maximum for bufp */ + void * bufp; /* current output buffer */ + void * ebufp; /* absolute maximum for bufp */ int chunk; /* chunk size on input medium */ int media_sz; /* size of input medium */ void (*strat)(struct buf *); /* strategy function for read */ @@ -104,8 +104,8 @@ static int loaddisk __P((struct md_conf *, dev_t ld_dev, struct lwp *)); static int ramd_norm_read __P((struct read_info *)); #ifdef support_compression -static int cpy_uncompressed __P((caddr_t, int, struct read_info *)); -static int md_compressed __P((caddr_t, int, struct read_info *)); +static int cpy_uncompressed __P((void *, int, struct read_info *)); +static int md_compressed __P((void *, int, struct read_info *)); #endif /* @@ -194,7 +194,7 @@ struct lwp *lwp; */ if((error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, lwp)) != 0) return(error); - if(bdp->d_ioctl(ld_dev, DIOCGDINFO, (caddr_t)&dl, FREAD, lwp) == 0) { + if(bdp->d_ioctl(ld_dev, DIOCGDINFO, (void *)&dl, FREAD, lwp) == 0) { /* Read on a cylinder basis */ rs.chunk = dl.d_secsize * dl.d_secpercyl; rs.media_sz = dl.d_secperunit * dl.d_secsize; @@ -239,7 +239,7 @@ struct read_info *rsp; /* Wait for results */ s = splbio(); while ((bp->b_flags & B_DONE) == 0) - tsleep((caddr_t) bp, PRIBIO + 1, "ramd_norm_read", 0); + tsleep((void *) bp, PRIBIO + 1, "ramd_norm_read", 0); if (bp->b_flags & B_ERROR) error = (bp->b_error ? bp->b_error : EIO); splx(s); @@ -277,7 +277,7 @@ struct read_info *rsp; */ static int cpy_uncompressed(buf, nbyte, rsp) -caddr_t buf; +void * buf; struct read_info *rsp; int nbyte; { @@ -293,7 +293,7 @@ int nbyte; */ static int md_compressed(buf, nbyte, rsp) -caddr_t buf; +void * buf; struct read_info *rsp; int nbyte; { @@ -322,7 +322,7 @@ int nbyte; /* Wait for results */ s = splbio(); while ((bp->b_flags & B_DONE) == 0) - tsleep((caddr_t) bp, PRIBIO + 1, "ramd_norm_read", 0); + tsleep((void *) bp, PRIBIO + 1, "ramd_norm_read", 0); if (bp->b_flags & B_ERROR) error = (bp->b_error ? bp->b_error : EIO); splx(s); diff --git a/sys/arch/atari/dev/ms.c b/sys/arch/atari/dev/ms.c index fd242603c3f..e6e2a4c0998 100644 --- a/sys/arch/atari/dev/ms.c +++ b/sys/arch/atari/dev/ms.c @@ -1,4 +1,4 @@ -/* $NetBSD: ms.c,v 1.16 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: ms.c,v 1.17 2007/03/04 05:59:40 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.16 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.17 2007/03/04 05:59:40 christos Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -376,7 +376,7 @@ int msioctl(dev, cmd, data, flag, l) dev_t dev; u_long cmd; -register caddr_t data; +register void * data; int flag; struct lwp *l; { diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c index a1c907e2db3..b670f4d99ef 100644 --- a/sys/arch/atari/dev/ncr5380.c +++ b/sys/arch/atari/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380.c,v 1.52 2006/02/25 02:28:56 wiz Exp $ */ +/* $NetBSD: ncr5380.c,v 1.53 2007/03/04 05:59:41 christos Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.52 2006/02/25 02:28:56 wiz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.53 2007/03/04 05:59:41 christos Exp $"); /* * Bit mask of targets you want debugging to be shown @@ -1813,7 +1813,7 @@ SC_REQ *reqp; { u_long phy_buf; u_long phy_len; - caddr_t req_addr; + void * req_addr; u_long req_len; struct dma_chain *dm; @@ -1821,7 +1821,7 @@ SC_REQ *reqp; * Initialize locals and requests' DMA-chain. */ req_len = reqp->xdata_len; - req_addr = (caddr_t)reqp->xdata_ptr; + req_addr = (void *)reqp->xdata_ptr; dm = reqp->dm_cur = reqp->dm_last = reqp->dm_chain; dm->dm_count = dm->dm_addr = 0; reqp->dr_flag &= ~DRIVER_BOUNCING; diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c index 30714fc916e..5363e0fdf73 100644 --- a/sys/arch/atari/dev/ser.c +++ b/sys/arch/atari/dev/ser.c @@ -1,4 +1,4 @@ -/* $NetBSD: ser.c,v 1.32 2006/10/01 20:31:50 elad Exp $ */ +/* $NetBSD: ser.c,v 1.33 2007/03/04 05:59:41 christos Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.32 2006/10/01 20:31:50 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.33 2007/03/04 05:59:41 christos Exp $"); #include "opt_ddb.h" #include "opt_mbtype.h" @@ -570,7 +570,7 @@ int serioctl(dev, cmd, data, flag, l) dev_t dev; u_long cmd; - caddr_t data; + void *data; int flag; struct lwp *l; { diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c index 5148b6efe04..9b25bde17a4 100644 --- a/sys/arch/atari/dev/view.c +++ b/sys/arch/atari/dev/view.c @@ -1,4 +1,4 @@ -/* $NetBSD: view.c,v 1.23 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: view.c,v 1.24 2007/03/04 05:59:41 christos Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -38,7 +38,7 @@ * a interface to graphics. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.23 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.24 2007/03/04 05:59:41 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -362,7 +362,7 @@ int viewioctl (dev, cmd, data, flag, l) dev_t dev; u_long cmd; -caddr_t data; +void * data; int flag; struct lwp *l; { diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c index 5ddfaa8c9eb..2cf3b89bde8 100644 --- a/sys/arch/atari/dev/zs.c +++ b/sys/arch/atari/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.51 2006/10/01 20:31:50 elad Exp $ */ +/* $NetBSD: zs.c,v 1.52 2007/03/04 05:59:41 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -82,7 +82,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.51 2006/10/01 20:31:50 elad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.52 2007/03/04 05:59:41 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -805,8 +805,8 @@ again: c = zc->zc_csr; if((c & ZSRR0_DCD) == 0) cs->cs_preg[3] &= ~ZSWR3_HFC; - bcopy((caddr_t)cs->cs_preg, - (caddr_t)cs->cs_creg, 16); + bcopy((void *)cs->cs_preg, + (void *)cs->cs_creg, 16); zs_loadchannelregs(zc, cs->cs_creg); splx(sps); cs->cs_heldchange = 0; @@ -821,7 +821,7 @@ again: if(tp->t_state & TS_FLUSH) tp->t_state &= ~TS_FLUSH; else ndflush(&tp->t_outq,cs->cs_tba - - (caddr_t)tp->t_outq.c_cf); + - (void *)tp->t_outq.c_cf); line->l_start(tp); break; @@ -858,7 +858,7 @@ int zsioctl(dev, cmd, data, flag, l) dev_t dev; u_long cmd; -caddr_t data; +void * data; int flag; struct lwp *l; { @@ -1004,7 +1004,7 @@ register struct tty *tp; if(tp->t_outq.c_cc <= tp->t_lowat) { if(tp->t_state & TS_ASLEEP) { tp->t_state &= ~TS_ASLEEP; - wakeup((caddr_t)&tp->t_outq); + wakeup((void *)&tp->t_outq); } selwakeup(&tp->t_wsel); } @@ -1076,7 +1076,7 @@ zs_shutdown(cs) */ if(tp->t_cflag & HUPCL) { zs_modem(cs, 0, DMSET); - (void)tsleep((caddr_t)cs, TTIPRI, ttclos, hz); + (void)tsleep((void *)cs, TTIPRI, ttclos, hz); } /* Clear any break condition set with TIOCSBRK. */ @@ -1194,7 +1194,7 @@ register struct termios *t; cs->cs_tbc = 0; cs->cs_heldchange = 1; } else { - bcopy((caddr_t)cs->cs_preg, (caddr_t)cs->cs_creg, 16); + bcopy((void *)cs->cs_preg, (void *)cs->cs_creg, 16); zs_loadchannelregs(cs->cs_zc, cs->cs_creg); } } diff --git a/sys/arch/atari/dev/zsvar.h b/sys/arch/atari/dev/zsvar.h index a88f5f4f742..d2d65ef459e 100644 --- a/sys/arch/atari/dev/zsvar.h +++ b/sys/arch/atari/dev/zsvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: zsvar.h,v 1.9 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: zsvar.h,v 1.10 2007/03/04 05:59:41 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -155,7 +155,7 @@ struct zs_chanstate { * also be stopped for ^S; this sets TS_TTSTOP in tp->t_state. */ int cs_tbc; /* transmit byte count */ - caddr_t cs_tba; /* transmit buffer address */ + void * cs_tba; /* transmit buffer address */ int cs_heldtbc; /* held tbc while xmission stopped */ /* |
