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

make this compile (again?) on sparc64 by sprinkling bus_space_vaddr(). 

Needs testing on both sparc and sparc64 - I don't have a magma.
This commit is contained in:
macallan 2007-08-12 17:53:01 +00:00
parent 306d09812c
commit 860afb1c25
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: magma.c,v 1.41 2007/07/09 21:01:21 ad Exp $ */
/* $NetBSD: magma.c,v 1.42 2007/08/12 17:53:01 macallan Exp $ */
/*
* magma.c
*
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.41 2007/07/09 21:01:21 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.42 2007/08/12 17:53:01 macallan Exp $");
#if 0
#define MAGMA_DEBUG
@ -207,7 +207,7 @@ dev_type_ioctl(mbppioctl);
const struct cdevsw mbpp_cdevsw = {
mbppopen, mbppclose, mbpp_rw, mbpp_rw, mbppioctl,
nostop, notty, nopoll, nommap, nokqfilter,
nostop, notty, nopoll, nommap, nokqfilter, D_OTHER
};
/************************************************************************
@ -430,7 +430,8 @@ magma_attach(parent, self, aux)
struct cd1400 *cd = &sc->ms_cd1400[chip];
cd->cd_clock = cd_clock;
cd->cd_reg = (char *)bh + card->mb_cd1400[chip];
cd->cd_reg = (char *)bus_space_vaddr(sa->sa_bustag, bh) +
card->mb_cd1400[chip];
/* prom_getpropstring(node, "chiprev"); */
/* seemingly the Magma drivers just ignore the propstring */
@ -469,7 +470,8 @@ magma_attach(parent, self, aux)
for( chip = 0 ; chip < card->mb_ncd1190 ; chip++ ) {
struct cd1190 *cd = &sc->ms_cd1190[chip];
cd->cd_reg = (char *)bh + card->mb_cd1190[chip];
cd->cd_reg = (char *)bus_space_vaddr(sa->sa_bustag, bh) +
card->mb_cd1190[chip];
/* XXX don't know anything about these chips yet */
printf("%s: CD1190 %d addr %p (unsupported)\n",