Module Name: src
Committed By: matt
Date: Sun Jul 15 20:54:15 UTC 2012
Modified Files:
src/sys/arch/arm/omap: omap_a2x_space.c omap_a4x_space.c
omap_nobyteacc_space.c omap_space.c
Log Message:
Add stream methods
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap_a2x_space.c \
src/sys/arch/arm/omap/omap_a4x_space.c \
src/sys/arch/arm/omap/omap_nobyteacc_space.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_space.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/omap/omap_a2x_space.c
diff -u src/sys/arch/arm/omap/omap_a2x_space.c:1.2 src/sys/arch/arm/omap/omap_a2x_space.c:1.3
--- src/sys/arch/arm/omap/omap_a2x_space.c:1.2 Fri Jul 1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap_a2x_space.c Sun Jul 15 20:54:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_a2x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
+/* $NetBSD: omap_a2x_space.c,v 1.3 2012/07/15 20:54:15 matt Exp $ */
/*
* Based on arch/arm/xscale/pxa2x0_a4x_space.c
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_a2x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_a2x_space.c,v 1.3 2012/07/15 20:54:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,6 +130,45 @@ struct bus_space omap_a2x_bs_tag = {
bs_notimpl_bs_c_2,
bs_notimpl_bs_c_4,
bs_notimpl_bs_c_8,
+
+#ifdef __BUS_SPACE_HAS_STREAM_METHODS
+ /* stream methods */
+ /* read (single) */
+ a2x_bs_r_1,
+ a2x_bs_r_2,
+ a2x_bs_r_4,
+ bs_notimpl_bs_r_8,
+
+ /* read multiple */
+ a2x_bs_rm_1,
+ a2x_bs_rm_2,
+ bs_notimpl_bs_rm_4,
+ bs_notimpl_bs_rm_8,
+
+ /* read region */
+ bs_notimpl_bs_rr_1,
+ bs_notimpl_bs_rr_2,
+ bs_notimpl_bs_rr_4,
+ bs_notimpl_bs_rr_8,
+
+ /* write (single) */
+ a2x_bs_w_1,
+ a2x_bs_w_2,
+ a2x_bs_w_4,
+ bs_notimpl_bs_w_8,
+
+ /* write multiple */
+ a2x_bs_wm_1,
+ a2x_bs_wm_2,
+ bs_notimpl_bs_wm_4,
+ bs_notimpl_bs_wm_8,
+
+ /* write region */
+ bs_notimpl_bs_wr_1,
+ bs_notimpl_bs_wr_2,
+ bs_notimpl_bs_wr_4,
+ bs_notimpl_bs_wr_8,
+#endif
};
Index: src/sys/arch/arm/omap/omap_a4x_space.c
diff -u src/sys/arch/arm/omap/omap_a4x_space.c:1.2 src/sys/arch/arm/omap/omap_a4x_space.c:1.3
--- src/sys/arch/arm/omap/omap_a4x_space.c:1.2 Fri Jul 1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap_a4x_space.c Sun Jul 15 20:54:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_a4x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
+/* $NetBSD: omap_a4x_space.c,v 1.3 2012/07/15 20:54:15 matt Exp $ */
/*
* Based on arch/arm/xscale/pxa2x0_a4x_space.c
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_a4x_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_a4x_space.c,v 1.3 2012/07/15 20:54:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -130,6 +130,44 @@ struct bus_space omap_a4x_bs_tag = {
bs_notimpl_bs_c_2,
bs_notimpl_bs_c_4,
bs_notimpl_bs_c_8,
+
+#ifdef __BUS_SPACE_HAS_STREAM_METHODS
+ /* read (single) */
+ a4x_bs_r_1,
+ a4x_bs_r_2,
+ a4x_bs_r_4,
+ bs_notimpl_bs_r_8,
+
+ /* read multiple */
+ a4x_bs_rm_1,
+ a4x_bs_rm_2,
+ bs_notimpl_bs_rm_4,
+ bs_notimpl_bs_rm_8,
+
+ /* read region */
+ bs_notimpl_bs_rr_1,
+ bs_notimpl_bs_rr_2,
+ bs_notimpl_bs_rr_4,
+ bs_notimpl_bs_rr_8,
+
+ /* write (single) */
+ a4x_bs_w_1,
+ a4x_bs_w_2,
+ a4x_bs_w_4,
+ bs_notimpl_bs_w_8,
+
+ /* write multiple */
+ a4x_bs_wm_1,
+ a4x_bs_wm_2,
+ bs_notimpl_bs_wm_4,
+ bs_notimpl_bs_wm_8,
+
+ /* write region */
+ bs_notimpl_bs_wr_1,
+ bs_notimpl_bs_wr_2,
+ bs_notimpl_bs_wr_4,
+ bs_notimpl_bs_wr_8,
+#endif
};
Index: src/sys/arch/arm/omap/omap_nobyteacc_space.c
diff -u src/sys/arch/arm/omap/omap_nobyteacc_space.c:1.2 src/sys/arch/arm/omap/omap_nobyteacc_space.c:1.3
--- src/sys/arch/arm/omap/omap_nobyteacc_space.c:1.2 Fri Jul 1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap_nobyteacc_space.c Sun Jul 15 20:54:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_nobyteacc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $ */
+/* $NetBSD: omap_nobyteacc_space.c,v 1.3 2012/07/15 20:54:15 matt Exp $ */
/*
* "nobyteacc" bus_space functions for Texas Instruments OMAP processor.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_nobyteacc_space.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_nobyteacc_space.c,v 1.3 2012/07/15 20:54:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,5 +164,43 @@ struct bus_space nobyteacc_bs_tag = {
generic_armv4_bs_c_2,
bs_notimpl_bs_c_4,
bs_notimpl_bs_c_8,
+
+#ifdef __BUS_SPACE_HAS_STREAM_METHODS
+ /* read (single) */
+ generic_bs_r_1,
+ generic_armv4_bs_r_2,
+ generic_bs_r_4,
+ bs_notimpl_bs_r_8,
+
+ /* read multiple */
+ generic_bs_rm_1,
+ generic_armv4_bs_rm_2,
+ generic_bs_rm_4,
+ bs_notimpl_bs_rm_8,
+
+ /* read region */
+ generic_bs_rr_1,
+ generic_armv4_bs_rr_2,
+ generic_bs_rr_4,
+ bs_notimpl_bs_rr_8,
+
+ /* write (single) */
+ nobyteacc_bs_w_1, /* promote 8-bit writes to 16-bit */
+ generic_armv4_bs_w_2,
+ generic_bs_w_4,
+ bs_notimpl_bs_w_8,
+
+ /* write multiple */
+ bs_notimpl_bs_wm_1,
+ generic_armv4_bs_wm_2,
+ generic_bs_wm_4,
+ bs_notimpl_bs_wm_8,
+
+ /* write region */
+ bs_notimpl_bs_wr_1,
+ generic_armv4_bs_wr_2,
+ generic_bs_wr_4,
+ bs_notimpl_bs_wr_8,
+#endif
};
Index: src/sys/arch/arm/omap/omap_space.c
diff -u src/sys/arch/arm/omap/omap_space.c:1.4 src/sys/arch/arm/omap/omap_space.c:1.5
--- src/sys/arch/arm/omap/omap_space.c:1.4 Fri Jul 1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap_space.c Sun Jul 15 20:54:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_space.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $ */
+/* $NetBSD: omap_space.c,v 1.5 2012/07/15 20:54:15 matt Exp $ */
/*
* bus_space functions for Texas Instruments OMAP processor.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_space.c,v 1.4 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_space.c,v 1.5 2012/07/15 20:54:15 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,6 +163,44 @@ struct bus_space omap_bs_tag = {
generic_armv4_bs_c_2,
bs_notimpl_bs_c_4,
bs_notimpl_bs_c_8,
+
+#ifdef __BUS_SPACE_HAS_STREAM_METHODS
+ /* read (single) */
+ generic_bs_r_1,
+ generic_armv4_bs_r_2,
+ generic_bs_r_4,
+ bs_notimpl_bs_r_8,
+
+ /* read multiple */
+ generic_bs_rm_1,
+ generic_armv4_bs_rm_2,
+ generic_bs_rm_4,
+ bs_notimpl_bs_rm_8,
+
+ /* read region */
+ generic_bs_rr_1,
+ generic_armv4_bs_rr_2,
+ generic_bs_rr_4,
+ bs_notimpl_bs_rr_8,
+
+ /* write (single) */
+ generic_bs_w_1,
+ generic_armv4_bs_w_2,
+ generic_bs_w_4,
+ bs_notimpl_bs_w_8,
+
+ /* write multiple */
+ generic_bs_wm_1,
+ generic_armv4_bs_wm_2,
+ generic_bs_wm_4,
+ bs_notimpl_bs_wm_8,
+
+ /* write region */
+ generic_bs_wr_1,
+ generic_armv4_bs_wr_2,
+ generic_bs_wr_4,
+ bs_notimpl_bs_wr_8,
+#endif
};
int
@@ -268,4 +306,3 @@ omap_bs_free(void *t, bus_space_handle_t
panic("%s(): not implemented\n", __func__);
}
-
