[src/netbsd-1-5]: src/sys/dev/rcons pullup 1.5, approved by thorpej

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

details:   https://anonhg.NetBSD.org/src/rev/0718d2e5223c
branches:  netbsd-1-5
changeset: 489695:0718d2e5223c
user:      deberg <deberg%NetBSD.org@localhost>
date:      Fri Oct 06 23:23:55 2000 +0000

description:
pullup 1.5, approved by thorpej

fix 16BPP support (for next68k), from Timm Wetzel.

diffstat:

 sys/dev/rcons/raster.h |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r 68a4b7ce5845 -r 0718d2e5223c sys/dev/rcons/raster.h
--- a/sys/dev/rcons/raster.h    Fri Oct 06 23:22:48 2000 +0000
+++ b/sys/dev/rcons/raster.h    Fri Oct 06 23:23:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raster.h,v 1.4 1999/01/11 11:08:14 drochner Exp $ */
+/*     $NetBSD: raster.h,v 1.4.18.1 2000/10/06 23:23:55 deberg Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -159,12 +159,20 @@
 #define RAS_OR                 0xe     /* src | dst */
 #define RAS_SET                        0xf     /* 1 */
 
+#ifndef RCONS_16BPP
 #define RAS_COLOR(color) ( ( (color) & 0xff ) << 4 )
+#else
+#define RAS_COLOR(color) ( ( (color) & 0xffff ) << 4 )
+#endif
 
 /* Get the op from a rop. */
 #define RAS_GETOP(op) ( (op) & 0xf )
 /* Get the color from a rop. */
+#ifndef RCONS_16BPP
 #define RAS_GETCOLOR(op) ( ( (op) >> 4 ) & 0xff )
+#else
+#define RAS_GETCOLOR(op) ( ( (op) >> 4 ) & 0xffff )
+#endif
 /* Get the longword address of a pixel. */
 #define RAS_ADDR( r, x, y ) \
     ( (r)->pixels + (y) * (r)->linelongs + (x) * (r)->depth / 32 )