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

After move to 64-bit paddr_t, cast via vaddr_t before casting to void*. 

OK'ed by macallan@.
This commit is contained in:
he 2007-07-23 22:28:23 +00:00
parent 7888db603a
commit 03d59d870c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/sgimips/hpc/haltwo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: haltwo.c,v 1.12 2007/03/04 06:00:39 christos Exp $ */
/* $NetBSD: haltwo.c,v 1.13 2007/07/23 22:28:23 he Exp $ */
/*
* Copyright (c) 2003 Ilpo Ruotsalainen
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.12 2007/03/04 06:00:39 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1.13 2007/07/23 22:28:23 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -267,12 +267,12 @@ haltwo_match(struct device *parent, struct cfdata *cf, void *aux)
if (strcmp(haa->ha_name, cf->cf_name))
return 0;
if ( platform.badaddr((void *)(haa->ha_sh + haa->ha_devoff),
if ( platform.badaddr((void *)(vaddr_t)(haa->ha_sh + haa->ha_devoff),
sizeof(u_int32_t)) )
return 0;
if ( platform.badaddr(
(void *)(haa->ha_sh + haa->ha_devoff + HAL2_REG_CTL_REV),
(void *)(vaddr_t)(haa->ha_sh + haa->ha_devoff + HAL2_REG_CTL_REV),
sizeof(u_int32_t)) )
return 0;

6
sys/arch/sgimips/hpc/hpc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpc.c,v 1.58 2007/07/09 20:52:26 ad Exp $ */
/* $NetBSD: hpc.c,v 1.59 2007/07/23 22:28:23 he Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.58 2007/07/09 20:52:26 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.59 2007/07/23 22:28:23 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -659,7 +659,7 @@ hpc_print(void *aux, const char *pnp)
if (pnp)
printf("%s at %s", ha->ha_name, pnp);
printf(" offset 0x%lx", ha->ha_devoff);
printf(" offset 0x%lx", (vaddr_t)ha->ha_devoff);
return (UNCONF);
}

6
sys/arch/sgimips/hpc/hpcdma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpcdma.c,v 1.12 2007/03/04 06:00:39 christos Exp $ */
/* $NetBSD: hpcdma.c,v 1.13 2007/07/23 22:28:23 he Exp $ */
/*
* Copyright (c) 2001 Wayne Knowles
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.12 2007/03/04 06:00:39 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1.13 2007/07/23 22:28:23 he Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -112,7 +112,7 @@ hpcdma_init(struct hpc_attach_args *haa, struct hpc_dma_softc *sc, int ndesc)
return;
}
sc->sc_desc_pa = (void *) sc->sc_dmamap->dm_segs[0].ds_addr;
sc->sc_desc_pa = (void *) (vaddr_t)sc->sc_dmamap->dm_segs[0].ds_addr;
}