Module Name: src
Committed By: macallan
Date: Fri May 4 17:20:34 UTC 2018
Modified Files:
src/sys/arch/macppc/dev: snapper.c
Log Message:
use obio_space_map() to map DMA registers, now this works on both G5 and
32bit hardware
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/macppc/dev/snapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.46 src/sys/arch/macppc/dev/snapper.c:1.47
--- src/sys/arch/macppc/dev/snapper.c:1.46 Thu Mar 29 18:34:32 2018
+++ src/sys/arch/macppc/dev/snapper.c Fri May 4 17:20:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.46 2018/03/29 18:34:32 macallan Exp $ */
+/* $NetBSD: snapper.c,v 1.47 2018/05/04 17:20:34 macallan Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.46 2018/03/29 18:34:32 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.47 2018/05/04 17:20:34 macallan Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -788,10 +788,8 @@ snapper_attach(device_t parent, device_t
#endif
bus_space_map(sc->sc_tag, reg[0], reg[1], 0, &sc->sc_bsh);
- bus_space_map(sc->sc_tag, reg[2], reg[3],
- BUS_SPACE_MAP_LINEAR, &sc->sc_odmah);
- bus_space_map(sc->sc_tag, reg[4], reg[5],
- BUS_SPACE_MAP_LINEAR, &sc->sc_idmah);
+ obio_space_map(reg[2], reg[3], &sc->sc_odmah);
+ obio_space_map(reg[4], reg[5], &sc->sc_idmah);
sc->sc_odma = bus_space_vaddr(sc->sc_tag, sc->sc_odmah);
sc->sc_idma = bus_space_vaddr(sc->sc_tag, sc->sc_idmah);
