From owner-p4-projects@FreeBSD.ORG  Mon Dec 18 01:31:34 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 1986F16A47C; Mon, 18 Dec 2006 01:31:34 +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 E715616A416
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 01:31: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 C5B9D43CAE
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 01:31:29 +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 kBI1VTAx087311
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 01:31:29 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBI1VT4J087304
	for perforce@freebsd.org; Mon, 18 Dec 2006 01:31:29 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 18 Dec 2006 01:31:29 GMT
Message-Id: <200612180131.kBI1VT4J087304@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 111864 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: Mon, 18 Dec 2006 01:31:34 -0000

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

Change 111864 by imp@imp_bugs on 2006/12/18 01:30:33

	Switch from 6-0 addressing to 7-1 addressing that the drivers
	expect.

Affected files ...

.. //depot/projects/arm/src/sys/dev/iicbus/icee.c#8 edit

Differences ...

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

@@ -178,13 +178,13 @@
 		    uio->uio_resid);
 		switch (sc->type) {
 		case 8:
-			slave = (uio->uio_offset >> 8) | sc->addr;
+			slave = (uio->uio_offset >> 7) | sc->addr;
 			msgs[0].len = 1;
 			msgs[1].len = len;
 			addr[0] = uio->uio_offset & 0xff;
 			break;
 		case 16:
-			slave = sc->addr | (uio->uio_offset >> 16);
+			slave = sc->addr | (uio->uio_offset >> 15);
 			msgs[0].len = 2;
 			msgs[1].len = len;
 			addr[0] = (uio->uio_offset >> 8) & 0xff;