Module Name: src
Committed By: macallan
Date: Mon Jul 7 15:22:07 UTC 2014
Modified Files:
src/sys/dev/sbus: tcx.c
Log Message:
actually put the colour space ID where it belongs in tcx_clearscreen()
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/sbus/tcx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sbus/tcx.c
diff -u src/sys/dev/sbus/tcx.c:1.52 src/sys/dev/sbus/tcx.c:1.53
--- src/sys/dev/sbus/tcx.c:1.52 Tue Jun 24 05:04:14 2014
+++ src/sys/dev/sbus/tcx.c Mon Jul 7 15:22:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.52 2014/06/24 05:04:14 macallan Exp $ */
+/* $NetBSD: tcx.c,v 1.53 2014/07/07 15:22:07 macallan Exp $ */
/*
* Copyright (c) 1996, 1998, 2009 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.52 2014/06/24 05:04:14 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.53 2014/07/07 15:22:07 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -903,9 +903,8 @@ tcx_clearscreen(struct tcx_softc *sc, in
uint64_t spc64;
int i, len;
- bg |= ((uint64_t)sc->sc_bg << 32);
- spc64 = (spc & 3) << 24;
- bg |= spc64;
+ spc64 = ((spc & 3) << 24) | sc->sc_bg;
+ bg |= (spc64 << 32);
len = sc->sc_fb.fb_type.fb_width * sc->sc_fb.fb_type.fb_height;
for (i = 0; i < len; i += 32)
