From owner-svn-src-all@FreeBSD.ORG  Sat Jan  5 21:05:17 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 59926A28;
 Sat,  5 Jan 2013 21:05:17 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 33D1D37C;
 Sat,  5 Jan 2013 21:05:17 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r05L5HU6062564;
 Sat, 5 Jan 2013 21:05:17 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r05L5GQU062562;
 Sat, 5 Jan 2013 21:05:16 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201301052105.r05L5GQU062562@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 5 Jan 2013 21:05:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245071 - in head/sys/arm: broadcom/bcm2835 versatile
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jan 2013 21:05:17 -0000

Author: gonzo
Date: Sat Jan  5 21:05:16 2013
New Revision: 245071
URL: http://svnweb.freebsd.org/changeset/base/245071

Log:
  Fix background color calculation
  
  Spotted by: ray@

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  head/sys/arm/versatile/versatile_clcd.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_fb.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Sat Jan  5 20:37:40 2013	(r245070)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_fb.c	Sat Jan  5 21:05:16 2013	(r245071)
@@ -891,7 +891,7 @@ bcmfb_putc(video_adapter_t *adp, vm_offs
 	    + (sc->depth/8) * (col + sc->xmargin);
 
 	fg = a & 0xf ;
-	bg = (a >> 8) & 0xf;
+	bg = (a >> 4) & 0xf;
 
 	for (i = 0; i < BCMFB_FONT_HEIGHT; i++) {
 		for (j = 0, k = 7; j < 8; j++, k--) {

Modified: head/sys/arm/versatile/versatile_clcd.c
==============================================================================
--- head/sys/arm/versatile/versatile_clcd.c	Sat Jan  5 20:37:40 2013	(r245070)
+++ head/sys/arm/versatile/versatile_clcd.c	Sat Jan  5 21:05:16 2013	(r245071)
@@ -892,7 +892,7 @@ versatilefb_putc(video_adapter_t *adp, v
 	    + (sc->depth/8) * (col + sc->xmargin);
 
 	fg = a & 0xf ;
-	bg = (a >> 8) & 0xf;
+	bg = (a >> 4) & 0xf;
 
 	for (i = 0; i < VERSATILE_FONT_HEIGHT; i++) {
 		for (j = 0, k = 7; j < 8; j++, k--) {