From owner-p4-projects@FreeBSD.ORG  Tue Jun  5 19:59:10 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 61CD810657A5; Tue,  5 Jun 2012 19:59:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 232421065786
	for <perforce@freebsd.org>; Tue,  5 Jun 2012 19:59:10 +0000 (UTC)
	(envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C8138FC12
	for <perforce@freebsd.org>; Tue,  5 Jun 2012 19:59:10 +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 q55Jx9wS038529
	for <perforce@freebsd.org>; Tue, 5 Jun 2012 19:59:09 GMT
	(envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q55Jx9se038526
	for perforce@freebsd.org; Tue, 5 Jun 2012 19:59:09 GMT
	(envelope-from brooks@freebsd.org)
Date: Tue, 5 Jun 2012 19:59:09 GMT
Message-Id: <201206051959.q55Jx9se038526@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 212338 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: Tue, 05 Jun 2012 19:59:10 -0000

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

Change 212338 by brooks@brooks_ecr_current on 2012/06/05 19:58:39

	Enable buffered writes after fixing an off by one error when
	programming the buffer word count.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/dev/isf/isf.c#7 (text+ko) ====

@@ -120,6 +120,8 @@
 #define ISF_SR_DWS	(1 << 7)	/* Device Write Status */
 #define ISF_SR_FSC_MASK	(ISF_SR_VPPS | ISF_SR_PS | ISF_SR_BLS)
 
+#define ISF_BUFFER_PROGRAM
+
 MALLOC_DEFINE(M_ISF, "isf_data", "Intel StrateFlash driver");
 static void	isf_task(void *arg);
 
@@ -272,10 +274,9 @@
 			/* XXX: should have a timeout */
 			isf_write_cmd(sc, coff, ISF_CMD_BPS);
 
-		isf_write_cmd(sc, coff, 32);
-		//bus_write_region_2(sc->isf_res, coff, dp, 32);
-		for (int i = 0; i < 32; i++)
-			isf_write_cmd(sc, coff + i * 2, *(dp + 1));
+		/* When writing N blocks, send N-1 as the count */
+		isf_write_cmd(sc, coff, 31);
+		bus_write_region_2(sc->isf_res, coff, dp, 32);
 
 		isf_write_cmd(sc, coff, ISF_CMD_BPC);