[src/trunk]: src/sys/dev/rasops Support little endian makestamp.

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/941d8f931d6b
branches:  trunk
changeset: 786237:941d8f931d6b
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Apr 21 04:28:05 2013 +0000

description:
Support little endian makestamp.

diffstat:

 sys/dev/rasops/rasops2.c |  26 ++++++++++++++++++++------
 sys/dev/rasops/rasops4.c |  26 ++++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diffs (94 lines):

diff -r 79c7d7da1706 -r 941d8f931d6b sys/dev/rasops/rasops2.c
--- a/sys/dev/rasops/rasops2.c  Sun Apr 21 02:50:48 2013 +0000
+++ b/sys/dev/rasops/rasops2.c  Sun Apr 21 04:28:05 2013 +0000
@@ -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 @@
        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 -r 79c7d7da1706 -r 941d8f931d6b sys/dev/rasops/rasops4.c
--- a/sys/dev/rasops/rasops4.c  Sun Apr 21 02:50:48 2013 +0000
+++ b/sys/dev/rasops/rasops4.c  Sun Apr 21 04:28:05 2013 +0000
@@ -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 @@
        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;
+               }
        }
 }