Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fall out from caddr_t changes.

This commit is contained in:
mrg 2007-03-04 22:12:43 +00:00
parent 6b1e46c136
commit a4960a24c9
11 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/sparc/dev/fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fd.c,v 1.128 2007/03/04 06:00:43 christos Exp $ */
/* $NetBSD: fd.c,v 1.129 2007/03/04 22:12:43 mrg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -108,7 +108,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.128 2007/03/04 06:00:43 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.129 2007/03/04 22:12:43 mrg Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@ -1571,7 +1571,7 @@ loop:
read = bp->b_flags & B_READ;
/* Setup for pseudo DMA */
fdc->sc_data = bp->b_data + fd->sc_skip;
fdc->sc_data = (char *)bp->b_data + fd->sc_skip;
fdc->sc_tc = fd->sc_nbytes;
bus_space_write_1(fdc->sc_bustag, fdc->sc_handle,

4
sys/arch/sparc/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.78 2007/03/04 06:00:45 christos Exp $ */
/* $NetBSD: pmap.h,v 1.79 2007/03/04 22:12:43 mrg Exp $ */
/*
* Copyright (c) 1996
@ -273,7 +273,7 @@ void pmap_virtual_space(vaddr_t *, vaddr_t *);
vaddr_t pmap_growkernel(vaddr_t);
#endif
void pmap_redzone(void);
void kvm_uncache(void *, int);
void kvm_uncache(char *, int);
struct user;
int mmu_pagein(struct pmap *pm, vaddr_t, int);
void pmap_writetext(unsigned char *, int);

8
sys/arch/sparc/sparc/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.99 2007/03/04 06:00:45 christos Exp $ */
/* $NetBSD: clock.c,v 1.100 2007/03/04 22:12:43 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.99 2007/03/04 06:00:45 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.100 2007/03/04 22:12:43 mrg Exp $");
#include "opt_sparc_arch.h"
@ -220,7 +220,7 @@ eeprom_uio(struct uio *uio)
int error;
int off; /* NOT off_t */
u_int cnt, bcnt;
void *buf = NULL;
char *buf = NULL;
if (!CPU_ISSUN4)
return (ENODEV);
@ -255,7 +255,7 @@ eeprom_uio(struct uio *uio)
if (uio->uio_rw == UIO_READ)
for (bcnt = 0; bcnt < EEPROM_SIZE; ++bcnt)
*(char *)(buf + bcnt) = *(char *)(eeprom_va + bcnt);
buf[bcnt] = eeprom_va[bcnt];
if ((error = uiomove(buf + off, (int)cnt, uio)) != 0)
goto out;

6
sys/arch/sparc/sparc/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.199 2007/03/04 06:00:45 christos Exp $ */
/* $NetBSD: cpu.c,v 1.200 2007/03/04 22:12:43 mrg Exp $ */
/*
* Copyright (c) 1996
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.199 2007/03/04 06:00:45 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.200 2007/03/04 22:12:43 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@ -1243,7 +1243,7 @@ sun4_hotfix(struct cpu_info *sc)
{
if ((sc->flags & CPUFLG_SUN4CACHEBUG) != 0)
kvm_uncache((void *)trapbase, 1);
kvm_uncache((char *)trapbase, 1);
/* Use the hardware-assisted page flush routine, if present */
if (sc->cacheinfo.c_hwflush)

6
sys/arch/sparc/sparc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.270 2007/03/04 09:22:04 macallan Exp $ */
/* $NetBSD: machdep.c,v 1.271 2007/03/04 22:12:44 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.270 2007/03/04 09:22:04 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.271 2007/03/04 22:12:44 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@ -520,7 +520,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask)
if (onstack)
fp = (struct sigframe_sigcontext *)
((void *)l->l_sigstk.ss_sp +
((char *)l->l_sigstk.ss_sp +
l->l_sigstk.ss_size);
else
fp = (struct sigframe_sigcontext *)oldsp;

16
sys/arch/sparc/sparc/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.312 2007/03/04 09:32:39 macallan Exp $ */
/* $NetBSD: pmap.c,v 1.313 2007/03/04 22:12:44 mrg Exp $ */
/*
* Copyright (c) 1996
@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.312 2007/03/04 09:32:39 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.313 2007/03/04 22:12:44 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -994,7 +994,9 @@ pgt_page_free(struct pool *pp, void *v)
static void get_phys_mem(void **);
void kvm_iocache(void *, int);
#if 0 /* not used */
void kvm_iocache(char *, int);
#endif
#ifdef DEBUG
void pm_check(char *, struct pmap *);
@ -7006,7 +7008,7 @@ void
pmap_copy_page4_4c(paddr_t src, paddr_t dst)
{
struct vm_page *pg;
void *sva, dva;
char *sva, *dva;
int spte, dpte;
if ((pg = PHYS_TO_VM_PAGE(src)) != NULL) {
@ -7278,7 +7280,7 @@ pmap_phys_address(int x)
* in locked kernel space. A cache flush is also done.
*/
void
kvm_uncache(void *va, int npages)
kvm_uncache(char *va, int npages)
{
struct vm_page *pg;
int pte;
@ -7323,6 +7325,7 @@ kvm_uncache(void *va, int npages)
}
}
#if 0 /* not used */
/*
* Turn on IO cache for a given (va, number of pages).
*
@ -7330,7 +7333,7 @@ kvm_uncache(void *va, int npages)
* in locked kernel space. A cache flush is also done.
*/
void
kvm_iocache(void *va, int npages)
kvm_iocache(char *va, int npages)
{
#if defined(SUN4M)
@ -7351,6 +7354,7 @@ kvm_iocache(void *va, int npages)
}
#endif
}
#endif
/*
* Find first virtual address >= *va that is

6
sys/arch/sparc/sparc/sunos_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sunos_machdep.c,v 1.18 2007/03/04 06:00:46 christos Exp $ */
/* $NetBSD: sunos_machdep.c,v 1.19 2007/03/04 22:12:44 mrg Exp $ */
/*
* Copyright (c) 1995 Matthew R. Green
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.18 2007/03/04 06:00:46 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: sunos_machdep.c,v 1.19 2007/03/04 22:12:44 mrg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -95,7 +95,7 @@ void sunos_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
if (onstack)
fp = (struct sunos_sigframe *)
((void *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
((char *)l->l_sigstk.ss_sp + l->l_sigstk.ss_size);
else
fp = (struct sunos_sigframe *)oldsp;

6
sys/dev/sbus/dbri.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dbri.c,v 1.7 2007/03/04 06:02:40 christos Exp $ */
/* $NetBSD: dbri.c,v 1.8 2007/03/04 22:12:44 mrg Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.7 2007/03/04 06:02:40 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.8 2007/03/04 22:12:44 mrg Exp $");
#include "audio.h"
#if NAUDIO > 0
@ -1689,7 +1689,7 @@ dbri_trigger_output(void *hdl, void *start, void *end, int blksize,
struct dbri_softc *sc = hdl;
unsigned long count, current, num;
count = (unsigned long)(((void *)end - (void *)start));
count = (unsigned long)(((char *)end - (char *)start));
num = count / blksize;
DPRINTF(("trigger_output(%lx %lx) : %d %ld %ld\n",

16
sys/dev/sbus/magma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: magma.c,v 1.39 2007/03/04 06:02:40 christos Exp $ */
/* $NetBSD: magma.c,v 1.40 2007/03/04 22:12:44 mrg Exp $ */
/*
* magma.c
*
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.39 2007/03/04 06:02:40 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.40 2007/03/04 22:12:44 mrg Exp $");
#if 0
#define MAGMA_DEBUG
@ -404,11 +404,11 @@ magma_attach(parent, self, aux)
}
/* the SVCACK* lines are daisychained */
sc->ms_svcackr = (void *)bus_space_vaddr(sa->sa_bustag, bh)
sc->ms_svcackr = (char *)bus_space_vaddr(sa->sa_bustag, bh)
+ card->mb_svcackr;
sc->ms_svcackt = (void *)bus_space_vaddr(sa->sa_bustag, bh)
sc->ms_svcackt = (char *)bus_space_vaddr(sa->sa_bustag, bh)
+ card->mb_svcackt;
sc->ms_svcackm = (void *)bus_space_vaddr(sa->sa_bustag, bh)
sc->ms_svcackm = (char *)bus_space_vaddr(sa->sa_bustag, bh)
+ card->mb_svcackm;
/*
@ -430,7 +430,7 @@ magma_attach(parent, self, aux)
struct cd1400 *cd = &sc->ms_cd1400[chip];
cd->cd_clock = cd_clock;
cd->cd_reg = (void *)bh + card->mb_cd1400[chip];
cd->cd_reg = (char *)bh + card->mb_cd1400[chip];
/* prom_getpropstring(node, "chiprev"); */
/* seemingly the Magma drivers just ignore the propstring */
@ -469,7 +469,7 @@ magma_attach(parent, self, aux)
for( chip = 0 ; chip < card->mb_ncd1190 ; chip++ ) {
struct cd1190 *cd = &sc->ms_cd1190[chip];
cd->cd_reg = (void *)bh + card->mb_cd1190[chip];
cd->cd_reg = (char *)bh + card->mb_cd1190[chip];
/* XXX don't know anything about these chips yet */
printf("%s: CD1190 %d addr %p (unsupported)\n",
@ -1624,7 +1624,7 @@ mbpp_rw(dev, uio, flag)
int port = MAGMA_PORT(dev);
struct mbpp_softc *ms = mbpp_cd.cd_devs[card];
struct mbpp_port *mp = &ms->ms_port[port];
void *buffer, ptr;
char *buffer, *ptr;
int buflen, cnt, len;
int s, error = 0;
int gotdata = 0;

10
sys/dev/vme/xd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.66 2007/03/04 06:02:50 christos Exp $ */
/* $NetBSD: xd.c,v 1.67 2007/03/04 22:12:44 mrg Exp $ */
/*
*
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.66 2007/03/04 06:02:50 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.67 2007/03/04 22:12:44 mrg Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@ -737,7 +737,7 @@ xdattach(parent, self, aux)
bus_dma_segment_t seg;
bus_addr_t busaddr;
void * dmaddr;
void * buf;
char * buf;
/*
* Always re-initialize the disk structure. We want statistics
@ -2393,7 +2393,7 @@ xdc_ioctlcmd(xd, dev, xio)
{
int s, rqno, dummy;
void *dvmabuf = NULL, buf = NULL;
char *dvmabuf = NULL, *buf = NULL;
struct xdc_softc *xdcsc;
int rseg, error;
bus_dma_segment_t seg;
@ -2484,7 +2484,7 @@ xdc_ioctlcmd(xd, dev, xio)
if ((error = xd_dmamem_alloc(xdcsc->dmatag, xdcsc->auxmap,
&seg, &rseg,
xio->dlen, &buf,
xio->dlen, (void **)&buf,
&busbuf)) != 0) {
return (error);
}

10
sys/dev/vme/xy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xy.c,v 1.69 2007/03/04 06:02:51 christos Exp $ */
/* $NetBSD: xy.c,v 1.70 2007/03/04 22:12:44 mrg Exp $ */
/*
*
@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.69 2007/03/04 06:02:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.70 2007/03/04 22:12:44 mrg Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@ -634,7 +634,7 @@ xyattach(parent, self, aux)
bus_dma_segment_t seg;
bus_addr_t busaddr;
void * dmaddr;
void * buf;
char * buf;
/*
* Always re-initialize the disk structure. We want statistics
@ -2210,7 +2210,7 @@ xyc_ioctlcmd(xy, dev, xio)
{
int s, rqno, dummy = 0;
void *dvmabuf = NULL, buf = NULL;
char *dvmabuf = NULL, *buf = NULL;
struct xyc_softc *xycsc;
int rseg, error;
bus_dma_segment_t seg;
@ -2249,7 +2249,7 @@ xyc_ioctlcmd(xy, dev, xio)
if ((error = xy_dmamem_alloc(xycsc->dmatag, xycsc->auxmap,
&seg, &rseg,
xio->dlen, &buf,
xio->dlen, (void **)&buf,
&busbuf)) != 0) {
return (error);
}