From owner-p4-projects@FreeBSD.ORG  Tue Dec 19 07:41:53 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 0C32D16A40F; Tue, 19 Dec 2006 07:41:53 +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 C6DA516A403
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 07:41:52 +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 9268243CA2
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 07:41:52 +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 kBJ7fpP8056236
	for <perforce@freebsd.org>; Tue, 19 Dec 2006 07:41:51 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ7fpqN056233
	for perforce@freebsd.org; Tue, 19 Dec 2006 07:41:51 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 19 Dec 2006 07:41:51 GMT
Message-Id: <200612190741.kBJ7fpqN056233@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 111928 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, 19 Dec 2006 07:41:53 -0000

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

Change 111928 by imp@imp_lighthouse on 2006/12/19 07:41:07

	Fix the argument to the read/write block routines so that
	iicbus_transfer_gen works again.  Sam must not have tried to do
	iic things on his avila board since I 'fixed' this before...

Affected files ...

.. //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/dev/iicbus/iiconf.c#5 (text+ko) ====

@@ -356,13 +356,16 @@
  * buffer addresses.
  */
 int
-iicbus_transfer_gen(device_t bus, struct iic_msg *msgs, uint32_t nmsgs)
+iicbus_transfer_gen(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
 {
-	int i, error, max, lenread, lenwrote;
+	int i, error, lenread, lenwrote, nkid;
+	device_t *children, bus;
 
-	for (i = 0, max = 0; i < nmsgs; i++)
-		if (max < msgs[i].len)
-			max = msgs[i].len;
+	device_get_children(dev, &children, &nkid);
+	if (nkid != 1)
+		return EIO;
+	bus = children[0];
+	free(children, M_TEMP);
 	for (i = 0, error = 0; i < nmsgs && error == 0; i++) {
 		if (msgs[i].flags & IIC_M_RD)
 			error = iicbus_block_read(bus, msgs[i].slave,