Module Name: src
Committed By: kiyohara
Date: Wed Jun 22 16:18:55 UTC 2011
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_i2c.c pxa2x0_i2c.h
src/sys/arch/zaurus/dev: zaudio.c
Log Message:
Add member sc_addr to struct pxa2x0_i2c_softc.
And use sc_addr to bus_space_map() instead of macro-directly.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/pxa2x0_i2c.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xscale/pxa2x0_i2c.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/zaurus/dev/zaudio.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/arm/xscale/pxa2x0_i2c.c
diff -u src/sys/arch/arm/xscale/pxa2x0_i2c.c:1.5 src/sys/arch/arm/xscale/pxa2x0_i2c.c:1.6
--- src/sys/arch/arm/xscale/pxa2x0_i2c.c:1.5 Sun Jun 19 16:16:42 2011
+++ src/sys/arch/arm/xscale/pxa2x0_i2c.c Wed Jun 22 16:18:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_i2c.c,v 1.5 2011/06/19 16:16:42 nonaka Exp $ */
+/* $NetBSD: pxa2x0_i2c.c,v 1.6 2011/06/22 16:18:55 kiyohara Exp $ */
/* $OpenBSD: pxa2x0_i2c.c,v 1.2 2005/05/26 03:52:07 pascoe Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c,v 1.5 2011/06/19 16:16:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c,v 1.6 2011/06/22 16:18:55 kiyohara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,7 +44,7 @@
{
int error;
- error = bus_space_map(sc->sc_iot, PXA2X0_I2C_BASE, sc->sc_size, 0,
+ error = bus_space_map(sc->sc_iot, sc->sc_addr, sc->sc_size, 0,
&sc->sc_ioh);
if (error) {
aprint_error_dev(sc->sc_dev, "unable to map register\n");
Index: src/sys/arch/arm/xscale/pxa2x0_i2c.h
diff -u src/sys/arch/arm/xscale/pxa2x0_i2c.h:1.3 src/sys/arch/arm/xscale/pxa2x0_i2c.h:1.4
--- src/sys/arch/arm/xscale/pxa2x0_i2c.h:1.3 Sun Jun 19 16:16:42 2011
+++ src/sys/arch/arm/xscale/pxa2x0_i2c.h Wed Jun 22 16:18:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_i2c.h,v 1.3 2011/06/19 16:16:42 nonaka Exp $ */
+/* $NetBSD: pxa2x0_i2c.h,v 1.4 2011/06/22 16:18:55 kiyohara Exp $ */
/* $OpenBSD: pxa2x0_i2c.h,v 1.2 2005/05/26 03:52:07 pascoe Exp $ */
/*
@@ -27,6 +27,7 @@
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
+ bus_addr_t sc_addr;
bus_size_t sc_size;
uint32_t sc_icr;
Index: src/sys/arch/zaurus/dev/zaudio.c
diff -u src/sys/arch/zaurus/dev/zaudio.c:1.13 src/sys/arch/zaurus/dev/zaudio.c:1.14
--- src/sys/arch/zaurus/dev/zaudio.c:1.13 Sun Jun 19 16:20:09 2011
+++ src/sys/arch/zaurus/dev/zaudio.c Wed Jun 22 16:18:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zaudio.c,v 1.13 2011/06/19 16:20:09 nonaka Exp $ */
+/* $NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $ */
/* $OpenBSD: zaurus_audio.c,v 1.8 2005/08/18 13:23:02 robert Exp $ */
/*
@@ -51,7 +51,7 @@
#include "opt_zaudio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.13 2011/06/19 16:20:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zaudio.c,v 1.14 2011/06/22 16:18:54 kiyohara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,6 +344,7 @@
sc->sc_i2s.sc_iot = &pxa2x0_bs_tag;
sc->sc_i2s.sc_dmat = &pxa2x0_bus_dma_tag;
+ sc->sc_i2c.sc_addr = PXA2X0_I2C_BASE;
sc->sc_i2s.sc_size = PXA2X0_I2S_SIZE;
if (pxa2x0_i2s_attach_sub(&sc->sc_i2s)) {
aprint_error_dev(self, "unable to attach I2S\n");
