svn commit: r277467 - in head/sys/arm: arm at91 cavium/cns11xx mv samsung/s3c2xx0 versatile xscale/i80321 xscale/i8134x xscale/ixp425 xscale/pxa
Ian Lepore
ian at FreeBSD.org
Wed Jan 21 02:56:18 UTC 2015
Author: ian
Date: Wed Jan 21 02:56:13 2015
New Revision: 277467
URL: https://svnweb.freebsd.org/changeset/base/277467
Log:
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.
Modified:
head/sys/arm/arm/bus_space-v6.c
head/sys/arm/arm/bus_space_asm_generic.S
head/sys/arm/at91/at91.c
head/sys/arm/cavium/cns11xx/econa.c
head/sys/arm/mv/bus_space.c
head/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
head/sys/arm/versatile/bus_space.c
head/sys/arm/versatile/versatile_pci_bus_space.c
head/sys/arm/xscale/i80321/i80321_space.c
head/sys/arm/xscale/i80321/obio_space.c
head/sys/arm/xscale/i8134x/i81342_space.c
head/sys/arm/xscale/i8134x/obio_space.c
head/sys/arm/xscale/ixp425/ixp425_a4x_space.c
head/sys/arm/xscale/ixp425/ixp425_space.c
head/sys/arm/xscale/pxa/pxa_space.c
Modified: head/sys/arm/arm/bus_space-v6.c
==============================================================================
--- head/sys/arm/arm/bus_space-v6.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/arm/bus_space-v6.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
/* Prototypes for all the bus_space structure functions */
bs_protos(generic);
-bs_protos(generic_armv4);
static void
bs_unimplemented(void)
@@ -77,13 +76,13 @@ static struct bus_space _base_tag = {
/* 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 = BS_UNIMPLEMENTED,
/* 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 = BS_UNIMPLEMENTED,
@@ -95,13 +94,13 @@ static struct bus_space _base_tag = {
/* 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 = BS_UNIMPLEMENTED,
/* 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 = BS_UNIMPLEMENTED,
@@ -113,13 +112,13 @@ static struct bus_space _base_tag = {
/* set region */
.bs_sr_1 = generic_bs_sr_1,
- .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 = BS_UNIMPLEMENTED,
/* copy */
.bs_c_1 = BS_UNIMPLEMENTED,
- .bs_c_2 = generic_armv4_bs_c_2,
+ .bs_c_2 = generic_bs_c_2,
.bs_c_4 = BS_UNIMPLEMENTED,
.bs_c_8 = BS_UNIMPLEMENTED,
@@ -131,13 +130,13 @@ static struct bus_space _base_tag = {
/* read multiple stream */
.bs_rm_1_s = generic_bs_rm_1,
- .bs_rm_2_s = generic_armv4_bs_rm_2,
+ .bs_rm_2_s = generic_bs_rm_2,
.bs_rm_4_s = generic_bs_rm_4,
.bs_rm_8_s = BS_UNIMPLEMENTED,
/* read region stream */
.bs_rr_1_s = generic_bs_rr_1,
- .bs_rr_2_s = generic_armv4_bs_rr_2,
+ .bs_rr_2_s = generic_bs_rr_2,
.bs_rr_4_s = generic_bs_rr_4,
.bs_rr_8_s = BS_UNIMPLEMENTED,
@@ -149,13 +148,13 @@ static struct bus_space _base_tag = {
/* write multiple stream */
.bs_wm_1_s = generic_bs_wm_1,
- .bs_wm_2_s = generic_armv4_bs_wm_2,
+ .bs_wm_2_s = generic_bs_wm_2,
.bs_wm_4_s = generic_bs_wm_4,
.bs_wm_8_s = BS_UNIMPLEMENTED,
/* write region stream */
.bs_wr_1_s = generic_bs_wr_1,
- .bs_wr_2_s = generic_armv4_bs_wr_2,
+ .bs_wr_2_s = generic_bs_wr_2,
.bs_wr_4_s = generic_bs_wr_4,
.bs_wr_8_s = BS_UNIMPLEMENTED,
};
Modified: head/sys/arm/arm/bus_space_asm_generic.S
==============================================================================
--- head/sys/arm/arm/bus_space_asm_generic.S Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/arm/bus_space_asm_generic.S Wed Jan 21 02:56:13 2015 (r277467)
@@ -52,10 +52,10 @@ ENTRY(generic_bs_r_1)
RET
END(generic_bs_r_1)
-ENTRY(generic_armv4_bs_r_2)
+ENTRY(generic_bs_r_2)
ldrh r0, [r1, r2]
RET
-END(generic_armv4_bs_r_2)
+END(generic_bs_r_2)
ENTRY(generic_bs_r_4)
ldr r0, [r1, r2]
@@ -71,10 +71,10 @@ ENTRY(generic_bs_w_1)
RET
END(generic_bs_w_1)
-ENTRY(generic_armv4_bs_w_2)
+ENTRY(generic_bs_w_2)
strh r3, [r1, r2]
RET
-END(generic_armv4_bs_w_2)
+END(generic_bs_w_2)
ENTRY(generic_bs_w_4)
str r3, [r1, r2]
@@ -100,7 +100,7 @@ ENTRY(generic_bs_rm_1)
RET
END(generic_bs_rm_1)
-ENTRY(generic_armv4_bs_rm_2)
+ENTRY(generic_bs_rm_2)
add r0, r1, r2
mov r1, r3
ldr r2, [sp, #0]
@@ -113,7 +113,7 @@ ENTRY(generic_armv4_bs_rm_2)
bne 1b
RET
-END(generic_armv4_bs_rm_2)
+END(generic_bs_rm_2)
ENTRY(generic_bs_rm_4)
add r0, r1, r2
@@ -149,7 +149,7 @@ ENTRY(generic_bs_wm_1)
RET
END(generic_bs_wm_1)
-ENTRY(generic_armv4_bs_wm_2)
+ENTRY(generic_bs_wm_2)
add r0, r1, r2
mov r1, r3
ldr r2, [sp, #0]
@@ -162,7 +162,7 @@ ENTRY(generic_armv4_bs_wm_2)
bne 1b
RET
-END(generic_armv4_bs_wm_2)
+END(generic_bs_wm_2)
ENTRY(generic_bs_wm_4)
add r0, r1, r2
@@ -198,7 +198,7 @@ ENTRY(generic_bs_rr_1)
RET
END(generic_bs_rr_1)
-ENTRY(generic_armv4_bs_rr_2)
+ENTRY(generic_bs_rr_2)
add r0, r1, r2
mov r1, r3
ldr r2, [sp, #0]
@@ -211,7 +211,7 @@ ENTRY(generic_armv4_bs_rr_2)
bne 1b
RET
-END(generic_armv4_bs_rr_2)
+END(generic_bs_rr_2)
ENTRY(generic_bs_rr_4)
add r0, r1, r2
@@ -247,7 +247,7 @@ ENTRY(generic_bs_wr_1)
RET
END(generic_bs_wr_1)
-ENTRY(generic_armv4_bs_wr_2)
+ENTRY(generic_bs_wr_2)
add r0, r1, r2
mov r1, r3
ldr r2, [sp, #0]
@@ -260,7 +260,7 @@ ENTRY(generic_armv4_bs_wr_2)
bne 1b
RET
-END(generic_armv4_bs_wr_2)
+END(generic_bs_wr_2)
ENTRY(generic_bs_wr_4)
add r0, r1, r2
@@ -295,7 +295,7 @@ ENTRY(generic_bs_sr_1)
RET
END(generic_bs_sr_1)
-ENTRY(generic_armv4_bs_sr_2)
+ENTRY(generic_bs_sr_2)
add r0, r1, r2
mov r1, r3
ldr r2, [sp, #0]
@@ -307,7 +307,7 @@ ENTRY(generic_armv4_bs_sr_2)
bne 1b
RET
-END(generic_armv4_bs_sr_2)
+END(generic_bs_sr_2)
ENTRY(generic_bs_sr_4)
add r0, r1, r2
@@ -327,7 +327,7 @@ END(generic_bs_sr_4)
* copy region
*/
-ENTRY(generic_armv4_bs_c_2)
+ENTRY(generic_bs_c_2)
add r0, r1, r2
ldr r2, [sp, #0]
add r1, r2, r3
@@ -356,5 +356,5 @@ ENTRY(generic_armv4_bs_c_2)
bne 3b
RET
-END(generic_armv4_bs_c_2)
+END(generic_bs_c_2)
Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/at91/at91.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -116,7 +116,6 @@ bus_dma_get_range_nb(void)
}
bs_protos(generic);
-bs_protos(generic_armv4);
struct bus_space at91_bs_tag = {
/* cookie */
@@ -136,37 +135,37 @@ struct bus_space at91_bs_tag = {
/* 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,
@@ -178,49 +177,49 @@ struct bus_space at91_bs_tag = {
/* 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,
};
Modified: head/sys/arm/cavium/cns11xx/econa.c
==============================================================================
--- head/sys/arm/cavium/cns11xx/econa.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/cavium/cns11xx/econa.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -57,7 +57,6 @@ unsigned int AHB_clock;
unsigned int APB_clock;
bs_protos(generic);
-bs_protos(generic_armv4);
struct bus_space econa_bs_tag = {
/* cookie */
@@ -77,31 +76,31 @@ struct bus_space econa_bs_tag = {
/* 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,
@@ -137,7 +136,7 @@ struct bus_space econa_bs_tag = {
/* read multiple stream */
NULL,
- generic_armv4_bs_rm_2,
+ generic_bs_rm_2,
NULL,
NULL,
@@ -155,7 +154,7 @@ struct bus_space econa_bs_tag = {
/* write multiple stream */
NULL,
- generic_armv4_bs_wm_2,
+ generic_bs_wm_2,
NULL,
NULL,
Modified: head/sys/arm/mv/bus_space.c
==============================================================================
--- head/sys/arm/mv/bus_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/mv/bus_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
/* Prototypes for all the bus_space structure functions */
bs_protos(generic);
-bs_protos(generic_armv4);
/*
* The bus space tag. This is constant for all instances, so
@@ -70,31 +69,31 @@ static struct bus_space _base_tag = {
/* 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,
@@ -130,7 +129,7 @@ static struct bus_space _base_tag = {
/* read multiple stream */
NULL,
- generic_armv4_bs_rm_2, /* bus_space_read_multi_stream_2 */
+ generic_bs_rm_2, /* bus_space_read_multi_stream_2 */
NULL,
NULL,
@@ -148,7 +147,7 @@ static struct bus_space _base_tag = {
/* write multiple stream */
NULL,
- generic_armv4_bs_wm_2, /* bus_space_write_multi_stream_2 */
+ generic_bs_wm_2, /* bus_space_write_multi_stream_2 */
NULL,
NULL,
Modified: head/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c
==============================================================================
--- head/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/samsung/s3c2xx0/s3c2xx0_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -90,7 +90,6 @@ __FBSDID("$FreeBSD$");
/* Prototypes for all the bus_space structure functions */
bs_protos(generic);
-bs_protos(generic_armv4);
struct bus_space s3c2xx0_bs_tag = {
/* cookie */
@@ -110,37 +109,37 @@ struct bus_space s3c2xx0_bs_tag = {
/* 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 */
generic_bs_wr_1,
- generic_armv4_bs_wr_2,
+ generic_bs_wr_2,
generic_bs_wr_4,
NULL,
@@ -152,13 +151,13 @@ struct bus_space s3c2xx0_bs_tag = {
/* set region */
generic_bs_sr_1,
- generic_armv4_bs_sr_2,
+ generic_bs_sr_2,
NULL,
NULL,
/* copy */
NULL,
- generic_armv4_bs_c_2,
+ generic_bs_c_2,
NULL,
NULL,
};
Modified: head/sys/arm/versatile/bus_space.c
==============================================================================
--- head/sys/arm/versatile/bus_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/versatile/bus_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
/* Prototypes for all the bus_space structure functions */
bs_protos(generic);
-bs_protos(generic_armv4);
struct bus_space _base_tag = {
/* cookie */
@@ -62,37 +61,37 @@ struct bus_space _base_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,
@@ -101,13 +100,13 @@ struct bus_space _base_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,
};
Modified: head/sys/arm/versatile/versatile_pci_bus_space.c
==============================================================================
--- head/sys/arm/versatile/versatile_pci_bus_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/versatile/versatile_pci_bus_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
/* Prototypes for all the bus_space structure functions */
bs_protos(generic);
-bs_protos(generic_armv4);
/*
* Bus space that handles offsets in word for 1/2 bytes read/write access.
@@ -61,37 +60,37 @@ static struct bus_space bus_space_pcimem
/* 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 */
generic_bs_wr_1,
- generic_armv4_bs_wr_2,
+ generic_bs_wr_2,
generic_bs_wr_4,
NULL,
Modified: head/sys/arm/xscale/i80321/i80321_space.c
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/xscale/i80321/i80321_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -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_tem
/* 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_tem
/* 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,
};
Modified: head/sys/arm/xscale/i80321/obio_space.c
==============================================================================
--- head/sys/arm/xscale/i80321/obio_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/xscale/i80321/obio_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -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,
Modified: head/sys/arm/xscale/i8134x/i81342_space.c
==============================================================================
--- head/sys/arm/xscale/i8134x/i81342_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/xscale/i8134x/i81342_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -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_tem
/* 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_tem
/* 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,
};
Modified: head/sys/arm/xscale/i8134x/obio_space.c
==============================================================================
--- head/sys/arm/xscale/i8134x/obio_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/xscale/i8134x/obio_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -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,
Modified: head/sys/arm/xscale/ixp425/ixp425_a4x_space.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425_a4x_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/xscale/ixp425/ixp425_a4x_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -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 */
Modified: head/sys/arm/xscale/ixp425/ixp425_space.c
==============================================================================
--- head/sys/arm/xscale/ixp425/ixp425_space.c Wed Jan 21 02:49:19 2015 (r277466)
+++ head/sys/arm/xscale/ixp425/ixp425_space.c Wed Jan 21 02:56:13 2015 (r277467)
@@ -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,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list