[PATCH 07/21] xfree86: Move generic unaligned helpers into int10 code

2014-07-22 Thread Adam Jackson 
This is the only place they're actually used (well, aside from some XAA
code in the s3 driver, but one s3 and 2 XAA).

Reviewed-by: Julien Cristau 
Signed-off-by: Adam Jackson 
---
 hw/xfree86/common/compiler.h | 36 
 hw/xfree86/int10/generic.c   | 36 
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index fc09cd2..06879b1 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -236,42 +236,6 @@ extern unsigned short ldw_brx(volatile unsigned char *, 
int);
 #define write_mem_barrier() /* NOP */
 #endif
 
-#include  /* needed for memmove */
-
-static __inline__ uint32_t
-ldl_u(uint32_t * p)
-{
-uint32_t ret;
-
-memmove(&ret, p, sizeof(*p));
-return ret;
-}
-
-static __inline__ uint16_t
-ldw_u(uint16_t * p)
-{
-uint16_t ret;
-
-memmove(&ret, p, sizeof(*p));
-return ret;
-}
-
-static __inline__ void
-stl_u(uint32_t val, uint32_t * p)
-{
-uint32_t tmp = val;
-
-memmove(p, &tmp, sizeof(*p));
-}
-
-static __inline__ void
-stw_u(uint16_t val, uint16_t * p)
-{
-uint16_t tmp = val;
-
-memmove(p, &tmp, sizeof(*p));
-}
-
 #ifdef __GNUC__
 #if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || 
defined(__OpenBSD__)) && (defined(__alpha__))
 
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index abbd36f..73a1e5e 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -20,6 +20,42 @@
 
 #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
 
+#include  /* needed for memmove */
+
+static __inline__ uint32_t
+ldl_u(uint32_t * p)
+{
+uint32_t ret;
+
+memmove(&ret, p, sizeof(*p));
+return ret;
+}
+
+static __inline__ uint16_t
+ldw_u(uint16_t * p)
+{
+uint16_t ret;
+
+memmove(&ret, p, sizeof(*p));
+return ret;
+}
+
+static __inline__ void
+stl_u(uint32_t val, uint32_t * p)
+{
+uint32_t tmp = val;
+
+memmove(p, &tmp, sizeof(*p));
+}
+
+static __inline__ void
+stw_u(uint16_t val, uint16_t * p)
+{
+uint16_t tmp = val;
+
+memmove(p, &tmp, sizeof(*p));
+}
+
 static uint8_t read_b(xf86Int10InfoPtr pInt, int addr);
 static uint16_t read_w(xf86Int10InfoPtr pInt, int addr);
 static uint32_t read_l(xf86Int10InfoPtr pInt, int addr);
-- 
1.9.3

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

[PATCH 07/21] xfree86: Move generic unaligned helpers into int10 code

2014-05-21 Thread Adam Jackson 
This is the only place they're actually used (well, aside from some XAA
code in the s3 driver, but one s3 and 2 XAA).

Signed-off-by: Adam Jackson 
---
 hw/xfree86/common/compiler.h | 36 
 hw/xfree86/int10/generic.c   | 36 
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 6d5..41acaf4 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -236,42 +236,6 @@ extern unsigned short ldw_brx(volatile unsigned char *, 
int);
 #define write_mem_barrier() /* NOP */
 #endif
 
-#include  /* needed for memmove */
-
-static __inline__ uint32_t
-ldl_u(uint32_t * p)
-{
-uint32_t ret;
-
-memmove(&ret, p, sizeof(*p));
-return ret;
-}
-
-static __inline__ uint16_t
-ldw_u(uint16_t * p)
-{
-uint16_t ret;
-
-memmove(&ret, p, sizeof(*p));
-return ret;
-}
-
-static __inline__ void
-stl_u(uint32_t val, uint32_t * p)
-{
-uint32_t tmp = val;
-
-memmove(p, &tmp, sizeof(*p));
-}
-
-static __inline__ void
-stw_u(uint16_t val, uint16_t * p)
-{
-uint16_t tmp = val;
-
-memmove(p, &tmp, sizeof(*p));
-}
-
 #ifdef __GNUC__
 #if (defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) || 
defined(__OpenBSD__)) && (defined(__alpha__))
 
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index abbd36f..73a1e5e 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -20,6 +20,42 @@
 
 #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
 
+#include  /* needed for memmove */
+
+static __inline__ uint32_t
+ldl_u(uint32_t * p)
+{
+uint32_t ret;
+
+memmove(&ret, p, sizeof(*p));
+return ret;
+}
+
+static __inline__ uint16_t
+ldw_u(uint16_t * p)
+{
+uint16_t ret;
+
+memmove(&ret, p, sizeof(*p));
+return ret;
+}
+
+static __inline__ void
+stl_u(uint32_t val, uint32_t * p)
+{
+uint32_t tmp = val;
+
+memmove(p, &tmp, sizeof(*p));
+}
+
+static __inline__ void
+stw_u(uint16_t val, uint16_t * p)
+{
+uint16_t tmp = val;
+
+memmove(p, &tmp, sizeof(*p));
+}
+
 static uint8_t read_b(xf86Int10InfoPtr pInt, int addr);
 static uint16_t read_w(xf86Int10InfoPtr pInt, int addr);
 static uint32_t read_l(xf86Int10InfoPtr pInt, int addr);
-- 
1.9.0

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel