diff options
| author | ian <ian@FreeBSD.org> | 2015-01-21 02:56:13 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2015-01-21 02:56:13 +0000 |
| commit | b4fa4f6baa40f0815a0bad3475903e47fee4b076 (patch) | |
| tree | 1a5952f52fa1f8d4e7b079793c0da7f55eecd912 /sys/arm/xscale/i8134x | |
| parent | 8b44e14d1e5c4fd0caad8246869aab56c5aee152 (diff) | |
| download | FreeBSD-src-b4fa4f6baa40f0815a0bad3475903e47fee4b076.zip FreeBSD-src-b4fa4f6baa40f0815a0bad3475903e47fee4b076.tar.gz | |
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.
Diffstat (limited to 'sys/arm/xscale/i8134x')
| -rw-r--r-- | sys/arm/xscale/i8134x/i81342_space.c | 29 | ||||
| -rw-r--r-- | sys/arm/xscale/i8134x/obio_space.c | 5 |
2 files changed, 16 insertions, 18 deletions
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, |
