For some reason, all the arm bus_space functions that work with uint16

values have armv4 in the name.  There's nothing armv4-special about them,
so just use the same sort of names as all the other functions.

7 files changed, 44 insertions, 51 deletions

diff --git a/sys/arm/xscale/i80321/i80321_space.c b/sys/arm/xscale/i80321/i80321_space.c
index 44a2ca8..da4ad21 100644
--- a/sys/arm/xscale/i80321/i80321_space.c
+++ b/sys/arm/xscale/i80321/i80321_space.c
@@ -64,7 +64,6 @@ bs_protos(i80321);
 bs_protos(i80321_io);
 bs_protos(i80321_mem);
 bs_protos(generic);
-bs_protos(generic_armv4);
 
 /*
  * Template bus_space -- copied, and the bits that are NULL are
@@ -88,37 +87,37 @@ const struct bus_space i80321_bs_tag_template = {
 
 	/* read (single) */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
+	generic_bs_r_2,
 	generic_bs_r_4,
 	NULL,
 
 	/* read multiple */
 	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
+	generic_bs_rm_2,
 	generic_bs_rm_4,
 	NULL,
 
 	/* read region */
 	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
+	generic_bs_rr_2,
 	generic_bs_rr_4,
 	NULL,
 
 	/* write (single) */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
+	generic_bs_w_2,
 	generic_bs_w_4,
 	NULL,
 
 	/* write multiple */
 	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
+	generic_bs_wm_2,
 	generic_bs_wm_4,
 	NULL,
 
 	/* write region */
 	NULL,
-	generic_armv4_bs_wr_2,
+	generic_bs_wr_2,
 	generic_bs_wr_4,
 	NULL,
 
@@ -130,49 +129,49 @@ const struct bus_space i80321_bs_tag_template = {
 
 	/* set region */
 	NULL,
-	generic_armv4_bs_sr_2,
+	generic_bs_sr_2,
 	generic_bs_sr_4,
 	NULL,
 
 	/* copy */
 	NULL,
-	generic_armv4_bs_c_2,
+	generic_bs_c_2,
 	NULL,
 	NULL,
 
 	/* read (single) stream */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
+	generic_bs_r_2,
 	generic_bs_r_4,
 	NULL,
 
 	/* read multiple stream */
 	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
+	generic_bs_rm_2,
 	generic_bs_rm_4,
 	NULL,
 
 	/* read region stream */
 	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
+	generic_bs_rr_2,
 	generic_bs_rr_4,
 	NULL,
 
 	/* write (single) stream */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
+	generic_bs_w_2,
 	generic_bs_w_4,
 	NULL,
 
 	/* write multiple stream */
 	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
+	generic_bs_wm_2,
 	generic_bs_wm_4,
 	NULL,
 
 	/* write region stream */
 	NULL,
-	generic_armv4_bs_wr_2,
+	generic_bs_wr_2,
 	generic_bs_wr_4,
 	NULL,
 };
diff --git a/sys/arm/xscale/i80321/obio_space.c b/sys/arm/xscale/i80321/obio_space.c
index 8b7b35e..4eba700 100644
--- a/sys/arm/xscale/i80321/obio_space.c
+++ b/sys/arm/xscale/i80321/obio_space.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(generic);
-bs_protos(generic_armv4);
 
 /*
  * The obio bus space tag.  This is constant for all instances, so
@@ -74,7 +73,7 @@ struct bus_space obio_bs_tag = {
 
 	/* read (single) */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
+	generic_bs_r_2,
 	generic_bs_r_4,
 	NULL,
 
@@ -92,7 +91,7 @@ struct bus_space obio_bs_tag = {
 
 	/* write (single) */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
+	generic_bs_w_2,
 	generic_bs_w_4,
 	NULL,
 
diff --git a/sys/arm/xscale/i8134x/i81342_space.c b/sys/arm/xscale/i8134x/i81342_space.c
index e194474..0f7912c 100644
--- a/sys/arm/xscale/i8134x/i81342_space.c
+++ b/sys/arm/xscale/i8134x/i81342_space.c
@@ -65,7 +65,6 @@ bs_protos(i81342);
 bs_protos(i81342_io);
 bs_protos(i81342_mem);
 bs_protos(generic);
-bs_protos(generic_armv4);
 
 /*
  * Template bus_space -- copied, and the bits that are NULL are
@@ -89,37 +88,37 @@ const struct bus_space i81342_bs_tag_template = {
 
 	/* read (single) */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
+	generic_bs_r_2,
 	generic_bs_r_4,
 	NULL,
 
 	/* read multiple */
 	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
+	generic_bs_rm_2,
 	generic_bs_rm_4,
 	NULL,
 
 	/* read region */
 	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
+	generic_bs_rr_2,
 	generic_bs_rr_4,
 	NULL,
 
 	/* write (single) */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
+	generic_bs_w_2,
 	generic_bs_w_4,
 	NULL,
 
 	/* write multiple */
 	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
+	generic_bs_wm_2,
 	generic_bs_wm_4,
 	NULL,
 
 	/* write region */
 	NULL,
-	generic_armv4_bs_wr_2,
+	generic_bs_wr_2,
 	generic_bs_wr_4,
 	NULL,
 
@@ -131,49 +130,49 @@ const struct bus_space i81342_bs_tag_template = {
 
 	/* set region */
 	NULL,
-	generic_armv4_bs_sr_2,
+	generic_bs_sr_2,
 	generic_bs_sr_4,
 	NULL,
 
 	/* copy */
 	NULL,
-	generic_armv4_bs_c_2,
+	generic_bs_c_2,
 	NULL,
 	NULL,
 
 	/* read (single) stream */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
+	generic_bs_r_2,
 	generic_bs_r_4,
 	NULL,
 
 	/* read multiple stream */
 	generic_bs_rm_1,
-	generic_armv4_bs_rm_2,
+	generic_bs_rm_2,
 	generic_bs_rm_4,
 	NULL,
 
 	/* read region stream */
 	generic_bs_rr_1,
-	generic_armv4_bs_rr_2,
+	generic_bs_rr_2,
 	generic_bs_rr_4,
 	NULL,
 
 	/* write (single) stream */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
+	generic_bs_w_2,
 	generic_bs_w_4,
 	NULL,
 
 	/* write multiple stream */
 	generic_bs_wm_1,
-	generic_armv4_bs_wm_2,
+	generic_bs_wm_2,
 	generic_bs_wm_4,
 	NULL,
 
 	/* write region stream */
 	NULL,
-	generic_armv4_bs_wr_2,
+	generic_bs_wr_2,
 	generic_bs_wr_4,
 	NULL,
 };
diff --git a/sys/arm/xscale/i8134x/obio_space.c b/sys/arm/xscale/i8134x/obio_space.c
index 8b7b35e..4eba700 100644
--- a/sys/arm/xscale/i8134x/obio_space.c
+++ b/sys/arm/xscale/i8134x/obio_space.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(generic);
-bs_protos(generic_armv4);
 
 /*
  * The obio bus space tag.  This is constant for all instances, so
@@ -74,7 +73,7 @@ struct bus_space obio_bs_tag = {
 
 	/* read (single) */
 	generic_bs_r_1,
-	generic_armv4_bs_r_2,
+	generic_bs_r_2,
 	generic_bs_r_4,
 	NULL,
 
@@ -92,7 +91,7 @@ struct bus_space obio_bs_tag = {
 
 	/* write (single) */
 	generic_bs_w_1,
-	generic_armv4_bs_w_2,
+	generic_bs_w_2,
 	generic_bs_w_4,
 	NULL,
 
diff --git a/sys/arm/xscale/ixp425/ixp425_a4x_space.c b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
index 23e48e8..1b128bb 100644
--- a/sys/arm/xscale/ixp425/ixp425_a4x_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_a4x_space.c
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 /* Prototypes for all the bus_space structure functions */
 bs_protos(a4x);
 bs_protos(generic);
-bs_protos(generic_armv4);
 
 struct bus_space ixp425_a4x_bs_tag = {
 	/* cookie */
diff --git a/sys/arm/xscale/ixp425/ixp425_space.c b/sys/arm/xscale/ixp425/ixp425_space.c
index 102bcd2..932c71b 100644
--- a/sys/arm/xscale/ixp425/ixp425_space.c
+++ b/sys/arm/xscale/ixp425/ixp425_space.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 
 /* Proto types for all the bus_space structure functions */
 bs_protos(generic);
-bs_protos(generic_armv4);
 
 struct bus_space ixp425_bs_tag = {
 	/* cookie */
@@ -79,37 +78,37 @@ struct bus_space ixp425_bs_tag = {
 
 	/* read (single) */
 	.bs_r_1		= generic_bs_r_1,
-	.bs_r_2		= generic_armv4_bs_r_2,
+	.bs_r_2		= generic_bs_r_2,
 	.bs_r_4		= generic_bs_r_4,
 	.bs_r_8		= NULL,
 
 	/* read multiple */
 	.bs_rm_1	= generic_bs_rm_1,
-	.bs_rm_2	= generic_armv4_bs_rm_2,
+	.bs_rm_2	= generic_bs_rm_2,
 	.bs_rm_4	= generic_bs_rm_4,
 	.bs_rm_8	= NULL,
 
 	/* read region */
 	.bs_rr_1	= generic_bs_rr_1,
-	.bs_rr_2	= generic_armv4_bs_rr_2,
+	.bs_rr_2	= generic_bs_rr_2,
 	.bs_rr_4	= generic_bs_rr_4,
 	.bs_rr_8	= NULL,
 
 	/* write (single) */
 	.bs_w_1		= generic_bs_w_1,
-	.bs_w_2		= generic_armv4_bs_w_2,
+	.bs_w_2		= generic_bs_w_2,
 	.bs_w_4		= generic_bs_w_4,
 	.bs_w_8		= NULL,
 
 	/* write multiple */
 	.bs_wm_1	= generic_bs_wm_1,
-	.bs_wm_2	= generic_armv4_bs_wm_2,
+	.bs_wm_2	= generic_bs_wm_2,
 	.bs_wm_4	= generic_bs_wm_4,
 	.bs_wm_8	= NULL,
 
 	/* write region */
 	.bs_wr_1	= generic_bs_wr_1,
-	.bs_wr_2	= generic_armv4_bs_wr_2,
+	.bs_wr_2	= generic_bs_wr_2,
 	.bs_wr_4	= generic_bs_wr_4,
 	.bs_wr_8	= NULL,
 
@@ -118,13 +117,13 @@ struct bus_space ixp425_bs_tag = {
 
 	/* set region */
 	.bs_sr_1	= NULL,
-	.bs_sr_2	= generic_armv4_bs_sr_2,
+	.bs_sr_2	= generic_bs_sr_2,
 	.bs_sr_4	= generic_bs_sr_4,
 	.bs_sr_8	= NULL,
 
 	/* copy */
 	.bs_c_1		= NULL,
-	.bs_c_2		= generic_armv4_bs_c_2,
+	.bs_c_2		= generic_bs_c_2,
 	.bs_c_4		= NULL,
 	.bs_c_8		= NULL,
 };
diff --git a/sys/arm/xscale/pxa/pxa_space.c b/sys/arm/xscale/pxa/pxa_space.c
index cfaac37..7a9160a 100644
--- a/sys/arm/xscale/pxa/pxa_space.c
+++ b/sys/arm/xscale/pxa/pxa_space.c
@@ -57,7 +57,6 @@ static MALLOC_DEFINE(M_PXATAG, "PXA bus_space tags", "Bus_space tags for PXA");
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(generic);
-bs_protos(generic_armv4);
 bs_protos(pxa);
 
 /*
@@ -179,7 +178,7 @@ pxa_bus_tag_alloc(bus_addr_t offset)
 	}
 
 READ_SINGLE(u_int8_t,  pxa_bs_r_1, generic_bs_r_1)
-READ_SINGLE(u_int16_t, pxa_bs_r_2, generic_armv4_bs_r_2)
+READ_SINGLE(u_int16_t, pxa_bs_r_2, generic_bs_r_2)
 READ_SINGLE(u_int32_t, pxa_bs_r_4, generic_bs_r_4)
 
 #undef READ_SINGLE
@@ -195,7 +194,7 @@ READ_SINGLE(u_int32_t, pxa_bs_r_4, generic_bs_r_4)
 	}
 
 WRITE_SINGLE(u_int8_t,  pxa_bs_w_1, generic_bs_w_1)
-WRITE_SINGLE(u_int16_t, pxa_bs_w_2, generic_armv4_bs_w_2)
+WRITE_SINGLE(u_int16_t, pxa_bs_w_2, generic_bs_w_2)
 WRITE_SINGLE(u_int32_t, pxa_bs_w_4, generic_bs_w_4)
 
 #undef WRITE_SINGLE
@@ -211,7 +210,7 @@ WRITE_SINGLE(u_int32_t, pxa_bs_w_4, generic_bs_w_4)
 	}
 
 READ_MULTI(u_int8_t,  pxa_bs_rm_1, generic_bs_rm_1)
-READ_MULTI(u_int16_t, pxa_bs_rm_2, generic_armv4_bs_rm_2)
+READ_MULTI(u_int16_t, pxa_bs_rm_2, generic_bs_rm_2)
 
 READ_MULTI(u_int8_t,  pxa_bs_rr_1, generic_bs_rr_1)
 
@@ -228,6 +227,6 @@ READ_MULTI(u_int8_t,  pxa_bs_rr_1, generic_bs_rr_1)
 	}
 
 WRITE_MULTI(u_int8_t,  pxa_bs_wm_1, generic_bs_wm_1)
-WRITE_MULTI(u_int16_t, pxa_bs_wm_2, generic_armv4_bs_wm_2)
+WRITE_MULTI(u_int16_t, pxa_bs_wm_2, generic_bs_wm_2)
 
 #undef WRITE_MULTI