Re: svn commit: r277467 - in head/sys/arm: arm at91 cavium/cns11xx mv samsung/s3c2xx0 versatile xscale/i80321 xscale/i8134x xscale/ixp425 xscale/pxa

[Andrew Turner]

On Wed, 21 Jan 2015 02:56:14 + (UTC)
Ian Lepore  wrote:

> 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.

This is because ARMv3 lacked half word load and store instructions. We
got this code from NetBSD who appears to have support for these older
ARM processors.

Andrew
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

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]

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.SWed Jan 21 02:49:19 2015
(r277466)
+++ head/sys/arm/arm/bus_space_asm_generic.SWed 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)
ldrhr0, [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)
s