From owner-p4-projects@FreeBSD.ORG  Thu May 10 04:20:18 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 25FDB106566B; Thu, 10 May 2012 04:20:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id D150A1065672
	for <perforce@freebsd.org>; Thu, 10 May 2012 04:20:17 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B94A78FC08
	for <perforce@freebsd.org>; Thu, 10 May 2012 04:20:17 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q4A4KHEK047020
	for <perforce@freebsd.org>; Thu, 10 May 2012 04:20:17 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q4A4KHLT047017
	for perforce@freebsd.org; Thu, 10 May 2012 04:20:17 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 10 May 2012 04:20:17 GMT
Message-Id: <201205100420.q4A4KHLT047017@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 210915 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2012 04:20:18 -0000

http://p4web.freebsd.org/@@210915?ac=10

Change 210915 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/05/10 04:19:22

	Correct and clarify use of the hardware cursor register for the
	Terasic MTL.  This doesn't actually make the hardware cursor work
	as there is missing glue somewhere between syscons and the MTL
	driver.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#6 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/mtl/terasic_mtl_reg.c#6 (text+ko) ====

@@ -212,9 +212,9 @@
 
 	v = bus_read_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTCURSOR);
 	v = le32toh(v);
-	*rowp = (v & TERASIC_MTL_TEXTCURSOR_COL_MASK) >>
+	*colp = (v & TERASIC_MTL_TEXTCURSOR_COL_MASK) >>
 	    TERASIC_MTL_TEXTCURSOR_COL_SHIFT;
-	*colp = (v & TERASIC_MTL_TEXTCURSOR_ROW_MASK);
+	*rowp = (v & TERASIC_MTL_TEXTCURSOR_ROW_MASK);
 }
 
 void
@@ -223,7 +223,7 @@
 {
 	uint32_t v;
 
-	v = col << TERASIC_MTL_TEXTCURSOR_COL_SHIFT | row;
+	v = (col << TERASIC_MTL_TEXTCURSOR_COL_SHIFT) | row;
 	v = htole32(v);
 	bus_write_4(sc->mtl_reg_res, TERASIC_MTL_OFF_TEXTCURSOR, v);
 }