summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-04-02 21:46:31 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-04-02 21:46:31 +0000
commit388d87997c38946df209774804e922a8ff703389 (patch)
tree23c663895f37b1fff40cda20085e48487792ab45 /sys/arch/macppc/dev
parent8f6fb32c43e2bc9a2bc8b5bf988dbb53ec7de943 (diff)
unmapiodev() takes the va as its first argument, not the pa.
ok gwk@
Diffstat (limited to 'sys/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/if_mc.c8
-rw-r--r--sys/arch/macppc/dev/mesh.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 762e01f1372..51bbf9727eb 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mc.c,v 1.8 2007/03/23 17:17:23 gwk Exp $ */
+/* $OpenBSD: if_mc.c,v 1.9 2007/04/02 21:46:30 kettenis Exp $ */
/* $NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $ */
/*-
@@ -484,11 +484,11 @@ nodmamem:
norxdbdma:
dbdma_free(sc->sc_txdbdma);
notxdbdma:
- unmapiodev((void *)ca->ca_reg[4], ca->ca_reg[5]);
+ unmapiodev((void *)sc->sc_rxdma, ca->ca_reg[5]);
norxdma:
- unmapiodev((void *)ca->ca_reg[2], ca->ca_reg[3]);
+ unmapiodev((void *)sc->sc_txdma, ca->ca_reg[3]);
notxdma:
- unmapiodev((void *)ca->ca_reg[0], ca->ca_reg[1]);
+ unmapiodev(sc->sc_reg, ca->ca_reg[1]);
}
int
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 599447a7675..5c58e0fe92a 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesh.c,v 1.16 2007/03/20 08:55:20 gwk Exp $ */
+/* $OpenBSD: mesh.c,v 1.17 2007/04/02 21:46:30 kettenis Exp $ */
/* $NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $ */
/*-
@@ -374,9 +374,9 @@ mesh_attach(struct device *parent, struct device *self, void *aux)
nodbdma:
bus_dmamap_destroy(sc->sc_dmat, sc->sc_dmamap);
nofreq:
- unmapiodev((void *)reg[2], reg[3]);
+ unmapiodev(sc->sc_dmareg, reg[3]);
noreg:
- unmapiodev((void *)reg[0], reg[1]);
+ unmapiodev(sc->sc_reg, reg[1]);
}
#define MESH_SET_XFER(sc, count) do { \