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

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

details:   https://anonhg.NetBSD.org/src/rev/8afe0f1fad8c
branches:  netbsd-1-5
changeset: 489696:8afe0f1fad8c
user:      deberg <deberg%NetBSD.org@localhost>
date:      Fri Oct 06 23:25:02 2000 +0000

description:
pullup 1.10, approved by thorpej

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

diffstat:

 sys/dev/rcons/raster_op.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 0718d2e5223c -r 8afe0f1fad8c sys/dev/rcons/raster_op.c
--- a/sys/dev/rcons/raster_op.c Fri Oct 06 23:23:55 2000 +0000
+++ b/sys/dev/rcons/raster_op.c Fri Oct 06 23:25:02 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raster_op.c,v 1.9 2000/03/30 12:45:41 augustss Exp $ */
+/*     $NetBSD: raster_op.c,v 1.9.4.1 2000/10/06 23:25:02 deberg Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -72,8 +72,8 @@
 
 #include <sys/types.h>
 #ifdef _KERNEL
+#include "opt_rcons.h"
 #include <dev/rcons/raster.h>
-#include "opt_rcons.h"
 #else
 #include "raster.h"
 #endif
@@ -924,7 +924,7 @@
 
            color = RAS_GETCOLOR( rop );
            if ( color == 0 )
-               color = 255;
+               color = 0xffff;
 
            /* Make 32 bits of color so we can do the ROP without shifting. */
            color |= ( color << 16 );
@@ -1538,7 +1538,7 @@
 
        color = RAS_GETCOLOR( rop );
        if ( color == 0 )
-               color = 255; /* XXX */
+               color = 0xffff; /* XXX */
 
        /* Make 32 bits of color so we can do the ROP without shifting. */
        color |= ( color << 16 );