PERFORCE change 210915 for review

[Robert Watson]

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

Change 210915 by rwatson at 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);
 }