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

fix fallout from caddr_t changes.

Browse Source
This commit is contained in:
yamt 2007-03-04 14:46:45 +00:00
parent 91302730a6
commit 65c9a0b32e
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/alpha/alpha/dec_eb164.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dec_eb164.c,v 1.55 2007/03/04 05:59:09 christos Exp $ */
/* $NetBSD: dec_eb164.c,v 1.56 2007/03/04 14:46:45 yamt Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.55 2007/03/04 05:59:09 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.56 2007/03/04 14:46:45 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -121,7 +121,7 @@ dec_eb164_cons_init()
ccp = &cia_configuration;
cia_init(ccp, 0);
ctb = (struct ctb *)(((void *)hwrpb) + hwrpb->rpb_ctb_off);
ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off);
switch (ctb->ctb_term_type) {
case CTB_PRINTERPORT:

8
sys/arch/alpha/alpha/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.31 2006/11/25 13:09:14 scw Exp $ */
/* $NetBSD: disksubr.c,v 1.32 2007/03/04 14:46:45 yamt Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.31 2006/11/25 13:09:14 scw Exp $");
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.32 2007/03/04 14:46:45 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -92,7 +92,7 @@ readdisklabel(dev, strat, lp, clp)
goto done;
}
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
dlp = (struct disklabel *)((char *)bp->b_data + LABELOFFSET);
if (dlp->d_magic == DISKMAGIC) {
if (dkcksum(dlp))
msg = "NetBSD disk label corrupted";
@ -226,7 +226,7 @@ writedisklabel(dev, strat, lp, clp)
if ((error = biowait(bp)) != 0)
goto done;
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
dlp = (struct disklabel *)((char *)bp->b_data + LABELOFFSET);
*dlp = *lp; /* struct assignment */
/*

12
sys/arch/alpha/alpha/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.295 2007/03/04 05:59:10 christos Exp $ */
/* $NetBSD: machdep.c,v 1.296 2007/03/04 14:46:45 yamt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@ -75,7 +75,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.295 2007/03/04 05:59:10 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.296 2007/03/04 14:46:45 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -444,7 +444,7 @@ nobootinfo:
* its best to detect things things that have never been seen
* before...
*/
mddtp = (struct mddt *)(((void *)hwrpb) + hwrpb->rpb_memdat_off);
mddtp = (struct mddt *)(((char *)hwrpb) + hwrpb->rpb_memdat_off);
/* MDDT SANITY CHECKING */
mddtweird = 0;
@ -906,8 +906,8 @@ alpha_dsr_sysname()
if (hwrpb->rpb_version < HWRPB_DSRDB_MINVERS)
return (NULL);
dsr = (struct dsrdb *)(((void *)hwrpb) + hwrpb->rpb_dsrdb_off);
sysname = (const char *)((void *)dsr + (dsr->dsr_sysname_off +
dsr = (struct dsrdb *)(((char *)hwrpb) + hwrpb->rpb_dsrdb_off);
sysname = (const char *)((char *)dsr + (dsr->dsr_sysname_off +
sizeof(u_int64_t)));
return (sysname);
}
@ -1440,7 +1440,7 @@ getframe(const struct lwp *l, int sig, int *onstack)
(SIGACTION(l->l_proc, sig).sa_flags & SA_ONSTACK) != 0;
if (*onstack)
frame = (void *)((void *)l->l_sigstk.ss_sp +
frame = (void *)((char *)l->l_sigstk.ss_sp +
l->l_sigstk.ss_size);
else
frame = (void *)(alpha_pal_rdusp());

9
sys/arch/alpha/alpha/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.219 2007/03/04 05:59:10 christos Exp $ */
/* $NetBSD: pmap.c,v 1.220 2007/03/04 14:46:45 yamt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -145,7 +145,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.219 2007/03/04 05:59:10 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.220 2007/03/04 14:46:45 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -2409,13 +2409,14 @@ pmap_zero_page(paddr_t phys)
void
pmap_copy_page(paddr_t src, paddr_t dst)
{
void *s, d;
const void *s;
void *d;
#ifdef DEBUG
if (pmapdebug & PDB_FOLLOW)
printf("pmap_copy_page(%lx, %lx)\n", src, dst);
#endif
s = (void *)ALPHA_PHYS_TO_K0SEG(src);
s = (const void *)ALPHA_PHYS_TO_K0SEG(src);
d = (void *)ALPHA_PHYS_TO_K0SEG(dst);
memcpy(d, s, PAGE_SIZE);
}

6
sys/arch/alpha/common/bus_dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_dma.c,v 1.63 2007/03/04 05:59:11 christos Exp $ */
/* $NetBSD: bus_dma.c,v 1.64 2007/03/04 14:46:46 yamt Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.63 2007/03/04 05:59:11 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.64 2007/03/04 14:46:46 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -660,7 +660,7 @@ _bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
continue;
}
return (alpha_btop((void *)segs[i].ds_addr + off));
return (alpha_btop((char *)segs[i].ds_addr + off));
}
/* Page not found. */