summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorkiyohara <kiyohara@NetBSD.org>2013-04-21 04:28:05 +0000
committerkiyohara <kiyohara@NetBSD.org>2013-04-21 04:28:05 +0000
commitdc440252ba1c50aedb39003cfecb826bb21cbdbc (patch)
tree4493901250b438164140ebe25bf1d789fc677bf4 /sys/dev
parentc0ac34b9d8b00e15cf2c80ded0308453846f8304 (diff)
Support little endian makestamp.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/rasops/rasops2.c26
-rw-r--r--sys/dev/rasops/rasops4.c26
2 files changed, 40 insertions, 12 deletions
diff --git a/sys/dev/rasops/rasops2.c b/sys/dev/rasops/rasops2.c
index 98ef7e041b9..470ce42d6df 100644
--- a/sys/dev/rasops/rasops2.c
+++ b/sys/dev/rasops/rasops2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops2.c,v 1.17 2010/05/04 19:16:22 macallan Exp $ */
+/* $NetBSD: rasops2.c,v 1.18 2013/04/21 04:28:05 kiyohara Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.17 2010/05/04 19:16:22 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.18 2013/04/21 04:28:05 kiyohara Exp $");
#include "opt_rasops.h"
@@ -229,10 +229,24 @@ rasops2_makestamp(struct rasops_info *ri, long attr)
stamp_attr = attr;
for (i = 0; i < 16; i++) {
- stamp[i] = (i & 1 ? fg : bg);
- stamp[i] |= (i & 2 ? fg : bg) << 2;
- stamp[i] |= (i & 4 ? fg : bg) << 4;
- stamp[i] |= (i & 8 ? fg : bg) << 6;
+#if BYTE_ORDER == BIG_ENDIAN
+#define NEED_LITTLE_ENDIAN_STAMP RI_BSWAP
+#else
+#define NEED_LITTLE_ENDIAN_STAMP 0
+#endif
+ if ((ri->ri_flg & RI_BSWAP) == NEED_LITTLE_ENDIAN_STAMP) {
+ /* littel endian */
+ stamp[i] = (i & 8 ? fg : bg);
+ stamp[i] |= (i & 4 ? fg : bg) << 2;
+ stamp[i] |= (i & 2 ? fg : bg) << 4;
+ stamp[i] |= (i & 1 ? fg : bg) << 6;
+ } else {
+ /* big endian */
+ stamp[i] = (i & 1 ? fg : bg);
+ stamp[i] |= (i & 2 ? fg : bg) << 2;
+ stamp[i] |= (i & 4 ? fg : bg) << 4;
+ stamp[i] |= (i & 8 ? fg : bg) << 6;
+ }
}
}
diff --git a/sys/dev/rasops/rasops4.c b/sys/dev/rasops/rasops4.c
index 5710127d10e..0bb137c961c 100644
--- a/sys/dev/rasops/rasops4.c
+++ b/sys/dev/rasops/rasops4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops4.c,v 1.10 2010/05/04 04:57:34 macallan Exp $ */
+/* $NetBSD: rasops4.c,v 1.11 2013/04/21 04:28:05 kiyohara Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.10 2010/05/04 04:57:34 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.11 2013/04/21 04:28:05 kiyohara Exp $");
#include "opt_rasops.h"
@@ -229,10 +229,24 @@ rasops4_makestamp(struct rasops_info *ri, long attr)
stamp_attr = attr;
for (i = 0; i < 16; i++) {
- stamp[i] = (i & 1 ? fg : bg) << 8;
- stamp[i] |= (i & 2 ? fg : bg) << 12;
- stamp[i] |= (i & 4 ? fg : bg) << 0;
- stamp[i] |= (i & 8 ? fg : bg) << 4;
+#if BYTE_ORDER == BIG_ENDIAN
+#define NEED_LITTLE_ENDIAN_STAMP RI_BSWAP
+#else
+#define NEED_LITTLE_ENDIAN_STAMP 0
+#endif
+ if ((ri->ri_flg & RI_BSWAP) == NEED_LITTLE_ENDIAN_STAMP) {
+ /* little endian */
+ stamp[i] = (i & 1 ? fg : bg) << 12;
+ stamp[i] |= (i & 2 ? fg : bg) << 8;
+ stamp[i] |= (i & 4 ? fg : bg) << 4;
+ stamp[i] |= (i & 8 ? fg : bg) << 0;
+ } else {
+ /* big endian */
+ stamp[i] = (i & 1 ? fg : bg) << 8;
+ stamp[i] |= (i & 2 ? fg : bg) << 12;
+ stamp[i] |= (i & 4 ? fg : bg) << 0;
+ stamp[i] |= (i & 8 ? fg : bg) << 4;
+ }
}
}