From owner-p4-projects@FreeBSD.ORG  Tue Nov  7 09:36:13 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 3E3ED16A47B; Tue,  7 Nov 2006 09:36:13 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0BB2E16A407
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 09:36:13 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B8A6243D5F
	for <perforce@freebsd.org>; Tue,  7 Nov 2006 09:36:12 +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 kA79aCBL099649
	for <perforce@freebsd.org>; Tue, 7 Nov 2006 09:36:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA79aC3E099646
	for perforce@freebsd.org; Tue, 7 Nov 2006 09:36:12 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 7 Nov 2006 09:36:12 GMT
Message-Id: <200611070936.kA79aC3E099646@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 109430 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: Tue, 07 Nov 2006 09:36:13 -0000

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

Change 109430 by imp@imp_lighthouse on 2006/11/07 09:35:32

	This loop can't be all we need...  But I think it might be, apart
	from some additional init...

Affected files ...

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

Differences ...

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

@@ -305,8 +305,16 @@
 {
 	struct at45d_softc *sc = (struct at45d_softc*)arg;
 	struct bio *bp;
+	uint8_t txBuf[8], rxBuf[8];
+	struct spi_command cmd;
+	int sz;
+	daddr_t block, end;
+	device_t dev, pdev;
+	int err;
 
 	for (;;) {
+		dev = sc->dev;
+		pdev = device_get_parent(dev);
 		AT45D_LOCK(sc);
 		do {
 			bp = bioq_first(&sc->bio_queue);
@@ -315,8 +323,29 @@
 		} while (bp == NULL);
 		bioq_remove(&sc->bio_queue, bp);
 		AT45D_UNLOCK(sc);
-		// XXX need to make the read/write request, maybe even
-		// XXX breaking things down into smaller blocks.
+		sz = sc->disk->d_sectorsize;
+		end = bp->bio_pblkno + (bp->bio_bcount / sz);
+		for (block = bp->bio_pblkno; block < end; ) {
+			char *vaddr = bp->bio_data + (block - bp->bio_pblkno) * sz;
+			if (bp->bio_cmd == BIO_READ)
+				txBuf[0] = CONTINUOUS_ARRAY_READ_HF;
+			else
+				txBuf[0] = PROGRAM_THROUGH_BUFFER;
+			// XXX only works on certain devices...  Fixme
+			txBuf[1] = ((block >> 5) & 0xFF);
+			txBuf[2] = ((block << 3) & 0xF8);
+			txBuf[3] = 0;
+			cmd.tx_cmd = txBuf;
+			cmd.tx_cmd_sz = 5;
+			cmd.rx_cmd = rxBuf;
+			cmd.rx_cmd_sz = 5;
+			cmd.tx_data = vaddr;
+			cmd.tx_data_sz = sz;
+			cmd.rx_data = vaddr;
+			cmd.rx_data_sz = sz;
+			err = SPIBUS_TRANSFER(pdev, dev, &cmd);
+			// XXX err check?
+		}
 		biodone(bp);
 	}
 }