From owner-p4-projects@FreeBSD.ORG  Wed Nov 22 02:14:33 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D08C016A415; Wed, 22 Nov 2006 02:14:33 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 92E8616A40F
	for <perforce@freebsd.org>; Wed, 22 Nov 2006 02:14:33 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B89AC43D46
	for <perforce@freebsd.org>; Wed, 22 Nov 2006 02:14:07 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAM2EX6k000636
	for <perforce@freebsd.org>; Wed, 22 Nov 2006 02:14:33 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAM2EXAZ000632
	for perforce@freebsd.org; Wed, 22 Nov 2006 02:14:33 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 22 Nov 2006 02:14:33 GMT
Message-Id: <200611220214.kAM2EXAZ000632@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110356 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 22 Nov 2006 02:14:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=110356

Change 110356 by imp@imp_lighthouse on 2006/11/22 02:14:23

	increment block to terminate loop
	try to get counts right, but something isn't quite right...

Affected files ...

.. //depot/projects/arm/src/sys/dev/flash/at45d.c#10 edit

Differences ...

==== //depot/projects/arm/src/sys/dev/flash/at45d.c#10 (text+ko) ====

@@ -257,7 +257,7 @@
 	at45d_get_mfg_info(sc->dev, buf);
 	printf("Reply is %#x %#x %#x %#x\n", buf[0], buf[1], buf[2], buf[3]);
 	at45d_wait_for_device_ready(sc->dev);
-	printf("Status is %#x\b", at45d_get_status(sc->dev));
+	printf("Status is %#x\n", at45d_get_status(sc->dev));
 
 	sc->disk = disk_alloc();
 	sc->disk->d_open = at45d_open;
@@ -324,8 +324,9 @@
 		bioq_remove(&sc->bio_queue, bp);
 		AT45D_UNLOCK(sc);
 		sz = sc->disk->d_sectorsize;
+		printf("Size is %d\n", sz);
 		end = bp->bio_pblkno + (bp->bio_bcount / sz);
-		for (block = bp->bio_pblkno; block < end; ) {
+		for (block = bp->bio_pblkno; block < end; block++) {
 			char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz;
 			if (bp->bio_cmd == BIO_READ)
 				txBuf[0] = CONTINUOUS_ARRAY_READ_HF;
@@ -335,6 +336,7 @@
 			txBuf[1] = ((block >> 5) & 0xFF);
 			txBuf[2] = ((block << 3) & 0xF8);
 			txBuf[3] = 0;
+			txBuf[4] = 0;
 			cmd.tx_cmd = txBuf;
 			cmd.tx_cmd_sz = 5;
 			cmd.rx_cmd = rxBuf;